summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TAO/orbsvcs/IFR_Service/diffs/InterfaceS.cpp.diff61875
-rw-r--r--TAO/orbsvcs/IFR_Service/diffs/InterfaceS.h.diff57510
-rw-r--r--TAO/orbsvcs/IFR_Service/diffs/InterfaceS.i.diff12
-rw-r--r--TAO/orbsvcs/IFR_Service/diffs/InterfaceS_T.i.diff6647
-rw-r--r--TAO/tao/IFR_Client/Interface.pidl67
-rw-r--r--TAO/tao/IFR_Client/diffs/InterfaceC.cpp.diff72949
-rw-r--r--TAO/tao/IFR_Client/diffs/InterfaceC.h.diff25302
-rw-r--r--TAO/tao/IFR_Client/diffs/InterfaceC.i.diff2086
8 files changed, 46488 insertions, 179960 deletions
diff --git a/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.cpp.diff
index 9943343a372..c7dc8c84170 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.cpp.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.cpp.diff
@@ -1,5 +1,5 @@
---- InterfaceS.cpp Fri Jan 12 22:31:13 2001
-+++ ..\InterfaceS.cpp Fri Jan 12 22:36:26 2001
+--- orig/InterfaceS.cpp Fri Mar 09 00:47:29 2001
++++ ../../orbsvcs/IFR_Service/InterfaceS.cpp Thu Mar 01 15:34:30 2001
@@ -1,6 +1,6 @@
// -*- C++ -*-
//
@@ -8,7 +8,16 @@
// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
// TAO and the TAO IDL Compiler have been developed by:
-@@ -23,6 +23,8 @@
+@@ -19,13 +19,15 @@
+ // Information about TAO is available at:
+ // http://www.cs.wustl.edu/~schmidt/TAO.html
+
+-#ifndef _TAO_IDL_ORIG_INTERFACES_CPP_
+-#define _TAO_IDL_ORIG_INTERFACES_CPP_
++#ifndef TAO_IDL_INTERFACES_CPP
++#define TAO_IDL_INTERFACES_CPP
+
+ #include "InterfaceS.h"
#include "tao/PortableServer/Object_Adapter.h"
#include "tao/PortableServer/Operation_Table.h"
@@ -17,16 +26,16 @@
#if TAO_HAS_INTERCEPTORS == 1
#include "tao/RequestInfo_Util.h"
#endif /* TAO_HAS_INTERCEPTORS == 1 */
-@@ -42,7 +44,7 @@
+@@ -45,7 +47,7 @@
public:
const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
};
--/* starting time is 16:31:11 */
+-/* starting time is 18:47:27 */
+/* starting time is 22:05:52 */
/* C++ code produced by gperf version 2.8 (ACE version) */
/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IRObject_Perfect_Hash_OpTable -N lookup */
unsigned int
-@@ -113,12 +115,12 @@
+@@ -116,12 +118,12 @@
static const class TAO_operation_db_entry wordlist[] =
{
{"",0},{"",0},{"",0},{"",0},{"",0},
@@ -43,11 +52,11 @@
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -135,37 +137,37 @@
+@@ -138,37 +140,37 @@
}
return 0;
}
--/* ending time is 16:31:11 */
+-/* ending time is 18:47:27 */
+/* ending time is 22:05:52 */
static TAO_CORBA_IRObject_Perfect_Hash_OpTable tao_CORBA_IRObject_optable;
@@ -89,7 +98,7 @@
::CORBA::IRObject *object,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -184,7 +186,7 @@
+@@ -187,7 +189,7 @@
}
void
@@ -98,7 +107,7 @@
TAO_ORB_Core::TAO_Collocation_Strategies strategy,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -198,7 +200,7 @@
+@@ -201,7 +203,7 @@
case TAO_ORB_Core::THRU_POA_STRATEGY:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
@@ -107,7 +116,7 @@
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -208,7 +210,7 @@
+@@ -211,7 +213,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
@@ -116,7 +125,7 @@
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -225,38 +227,42 @@
+@@ -228,38 +230,44 @@
///////////////////////////////////////////////////////////////////////
@@ -147,7 +156,12 @@
-static int CORBA__TAO_IRObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer));
+static int _TAO_IRObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-+ _TAO_IRObject_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_IRObject_Proxy_Broker_Factory_Initializer));
++ _TAO_IRObject_Proxy_Broker_Factory_Initializer (
++ ACE_reinterpret_cast (
++ long,
++ _TAO_IRObject_Proxy_Broker_Factory_Initializer
++ )
++ );
///////////////////////////////////////////////////////////////////////
@@ -156,9 +170,6 @@
-POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_TAO_IRObject_ThruPOA_Proxy_Impl (void)
+_TAO_IRObject_ThruPOA_Proxy_Impl::_TAO_IRObject_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+_TAO_IRObject_ThruPOA_Proxy_Impl::~_TAO_IRObject_ThruPOA_Proxy_Impl (void)
{}
// ThruPOA Implementation of the IDL interface methods
@@ -169,7 +180,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -264,7 +270,7 @@
+@@ -267,7 +275,7 @@
CORBA::SystemException
))
{
@@ -178,7 +189,7 @@
ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -278,7 +284,7 @@
+@@ -281,7 +289,7 @@
);
ACE_CHECK_RETURN (_tao_retval);
return ACE_reinterpret_cast (
@@ -187,7 +198,7 @@
servant_upcall.servant ()->_downcast (
"IDL:omg.org/CORBA/IRObject:1.0"
)
-@@ -287,7 +293,8 @@
+@@ -290,7 +298,8 @@
);
}
@@ -197,7 +208,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -307,7 +314,7 @@
+@@ -310,7 +319,7 @@
);
ACE_CHECK;
ACE_reinterpret_cast (
@@ -206,7 +217,7 @@
servant_upcall.servant ()->_downcast (
"IDL:omg.org/CORBA/IRObject:1.0"
)
-@@ -322,210 +329,105 @@
+@@ -325,31 +334,31 @@
///////////////////////////////////////////////////////////////////////
// skeleton constructor
@@ -231,175 +242,73 @@
-void POA_CORBA::IRObject::_get_def_kind_skel (
+void POA_CORBA_IRObject::_get_def_kind_skel (
TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
+ void *_tao_object_reference,
+ void * /* context */,
CORBA::Environment &ACE_TRY_ENV
)
{
- POA_CORBA::IRObject *_tao_impl = (POA_CORBA::IRObject *)_tao_object_reference;
+ POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *)_tao_object_reference;
-
-- IR::DefinitionKind _tao_retval;
+
+- IR::DefinitionKind _tao_retval;
+ IR_DefinitionKind _tao_retval;
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -357,7 +366,7 @@
+ _tao_server_request.interceptor_count ()
+ );
+
- POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->def_kind (
++ POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get ri (
+ _tao_server_request,
+ _tao_impl,
ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
-
-- _tao_impl->def_kind (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::DefinitionKind _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
- (_tao_out << _tao_retval)
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
+@@ -376,7 +385,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::DefinitionKind _tao_retval_info = _tao_retval;
++ IR_DefinitionKind _tao_retval_info = _tao_retval;
+ ri.result (_tao_retval_info);
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+ _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+@@ -419,14 +428,14 @@
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
}
-void POA_CORBA::IRObject::destroy_skel (
+void POA_CORBA_IRObject::destroy_skel (
TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
+ void *_tao_object_reference,
+ void * /* context */,
CORBA::Environment &ACE_TRY_ENV
-- )
-+)
+ )
{
- POA_CORBA::IRObject *_tao_impl = (POA_CORBA::IRObject *)_tao_object_reference;
+ POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *)_tao_object_reference;
-
--_tao_server_request.argument_flag (0);
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
+
+ _tao_server_request.argument_flag (0);
+
+@@ -436,7 +445,7 @@
+ _tao_server_request.interceptor_count ()
+ );
+
- POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_impl->destroy (
++ POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy ri (
+ _tao_server_request,
+ _tao_impl,
ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-
-- _tao_impl->destroy (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
+@@ -489,7 +498,7 @@
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
}
-void POA_CORBA::IRObject::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
+void POA_CORBA_IRObject::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
+ TAO_ServerRequest &_tao_server_request,
void * _tao_object_reference,
void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
+@@ -497,10 +506,10 @@
)
{
TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -410,12 +319,10 @@
- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
ACE_THROW (CORBA::MARSHAL ());
--
-+
+
_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -508,28 +517,28 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -424,9 +331,8 @@
}
-void POA_CORBA::IRObject::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
+void POA_CORBA_IRObject::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
+ TAO_ServerRequest &_tao_server_request,
void * _tao_object_reference,
void * /* context */,
CORBA::Environment &ACE_TRY_ENV
@@ -436,8 +342,7 @@
+ POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *) _tao_object_reference;
CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
ACE_CHECK;
--
-+
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -450,7 +355,7 @@
const char* value,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -538,29 +440,29 @@
+@@ -542,29 +551,29 @@
return 0;
}
@@ -459,12 +364,10 @@
const char* logical_type_id
)
{
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-+if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
}
@@ -487,216 +390,151 @@
{
TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-@@ -576,150 +478,6 @@
+@@ -580,11 +589,10 @@
return ::CORBA::IRObject::_unchecked_narrow (obj.in ());
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_CORBA::IRObject *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
++POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (
+ TAO_ServerRequest &_tao_server_request,
+- POA_CORBA::IRObject *tao_impl,
++ POA_CORBA_IRObject *tao_impl,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -592,7 +600,7 @@
+ {}
+
+ Dynamic::ParameterList *
-POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -604,7 +612,7 @@
+ }
+
+ Dynamic::ExceptionList *
-POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
++POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -616,7 +624,7 @@
+ }
+
+ CORBA::Any *
-POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
++POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -633,7 +641,7 @@
+ }
+
+ char *
-POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
++POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_most_derived_interface (
+ CORBA::Environment &)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+@@ -642,7 +650,7 @@
+ }
+
+ CORBA::Boolean
-POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
++POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_is_a (
+ const char * id,
+ CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -651,15 +659,15 @@
+ }
+
+ void
-POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (IR::DefinitionKind result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
++POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (IR::DefinitionKind result)
+ {
+ // Update the result.
+ this->_result = result;
+ }
+
-POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::TAO_ServerRequestInfo_CORBA_IRObject_destroy (
-- TAO_ServerRequest &_tao_server_request,
-- POA_CORBA::IRObject *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
++POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::TAO_ServerRequestInfo_CORBA_IRObject_destroy (
+ TAO_ServerRequest &_tao_server_request,
+- POA_CORBA::IRObject *tao_impl,
++ POA_CORBA_IRObject *tao_impl,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -667,7 +675,7 @@
+ {}
+
+ Dynamic::ParameterList *
-POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -679,7 +687,7 @@
+ }
+
+ Dynamic::ExceptionList *
-POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
++POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -691,7 +699,7 @@
+ }
+
+ CORBA::Any *
-POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
++POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -704,7 +712,7 @@
+ }
+
+ char *
-POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
++POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_most_derived_interface (
+ CORBA::Environment &)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+@@ -713,7 +721,7 @@
+ }
+
+ CORBA::Boolean
-POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--#endif /* TAO_HAS_INTERCEPTORS */
++POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_is_a (
+ const char * id,
+ CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+@@ -722,6 +730,7 @@
+ }
+
+ #endif /* TAO_HAS_INTERCEPTORS */
++
class TAO_IR_Contained_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
private:
-@@ -727,7 +485,7 @@
+@@ -729,7 +738,7 @@
public:
const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
};
--/* starting time is 16:31:11 */
+-/* starting time is 18:47:27 */
+/* starting time is 11:23:09 */
/* C++ code produced by gperf version 2.8 (ACE version) */
/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_Contained_Perfect_Hash_OpTable -N lookup */
unsigned int
-@@ -798,28 +556,28 @@
- static const class TAO_operation_db_entry wordlist[] =
- {
- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::Contained::move_skel},
-+ {"move", &POA_IR::Contained::move_skel},
- {"_is_a", &POA_IR::Contained::_is_a_skel},
-- {"_get_id", &POA_IR::Contained::_get_id_skel},
-- {"_set_id", &POA_IR::Contained::_set_id_skel},
-- {"describe", &POA_IR::Contained::describe_skel},
-- {"_get_name", &POA_IR::Contained::_get_name_skel},
-- {"_set_name", &POA_IR::Contained::_set_name_skel},
-- {"_get_version", &POA_IR::Contained::_get_version_skel},
-- {"_set_version", &POA_IR::Contained::_set_version_skel},
-- {"_get_def_kind", &POA_IR::Contained::_get_def_kind_skel},
-- {"_get_defined_in", &POA_IR::Contained::_get_defined_in_skel},
-- {"destroy", &POA_IR::Contained::destroy_skel},
-- {"_get_absolute_name", &POA_IR::Contained::_get_absolute_name_skel},
-+ {"_get_id", &POA_IR::Contained::_get_id_skel},
-+ {"_set_id", &POA_IR::Contained::_set_id_skel},
-+ {"describe", &POA_IR::Contained::describe_skel},
-+ {"_get_name", &POA_IR::Contained::_get_name_skel},
-+ {"_set_name", &POA_IR::Contained::_set_name_skel},
-+ {"_get_version", &POA_IR::Contained::_get_version_skel},
-+ {"_set_version", &POA_IR::Contained::_set_version_skel},
-+ {"_get_def_kind", &POA_IR::Contained::_get_def_kind_skel},
-+ {"_get_defined_in", &POA_IR::Contained::_get_defined_in_skel},
-+ {"destroy", &POA_IR::Contained::destroy_skel},
-+ {"_get_absolute_name", &POA_IR::Contained::_get_absolute_name_skel},
- {"_non_existent", &POA_IR::Contained::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::Contained::_get_containing_repository_skel},
-+ {"_get_containing_repository", &POA_IR::Contained::_get_containing_repository_skel},
- };
-
- static const signed char lookup[] =
- {
-- -6, -2, -9, -2, 4, 5, -1, -43, 8, -43, -11, -2, -38, 13,
-- -1, 14, -1, 15, 16, -1, -1, -1, -1, 17, -1, -1, -1, -1,
-- -1, -1, -1, -1, -1, -1, -1, -1, 18,
-+ -6, -2, -9, -2, 4, 5, -1, -43, 8, -43, -11, -2, -38, 13,
-+ -1, 14, -1, 15, 16, -1, -1, -1, -1, 17, -1, -1, -1, -1,
-+ -1, -1, -1, -1, -1, -1, -1, -1, 18,
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -853,16 +611,15 @@
+@@ -855,16 +864,15 @@
}
return 0;
}
--/* ending time is 16:31:11 */
+-/* ending time is 18:47:27 */
+/* ending time is 11:23:09 */
static TAO_IR_Contained_Perfect_Hash_OpTable tao_IR_Contained_optable;
@@ -711,7 +549,7 @@
{
static POA_IR::_TAO_Contained_Strategized_Proxy_Broker strategized_proxy_broker;
return &strategized_proxy_broker;
-@@ -882,9 +639,9 @@
+@@ -884,9 +892,9 @@
}
@@ -723,7 +561,7 @@
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -926,7 +683,7 @@
+@@ -928,7 +936,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
@@ -732,7 +570,7 @@
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -943,26 +700,26 @@
+@@ -945,26 +953,26 @@
///////////////////////////////////////////////////////////////////////
@@ -767,17 +605,16 @@
///////////////////////////////////////////////////////////////////////
-@@ -972,6 +729,9 @@
- POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::_TAO_Contained_ThruPOA_Proxy_Impl (void)
- {}
-
-+POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::~_TAO_Contained_ThruPOA_Proxy_Impl (void)
-+{}
-+
- // ThruPOA Implementation of the IDL interface methods
+@@ -1165,7 +1173,7 @@
+ return;
+ }
- char * POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::id (
-@@ -1171,7 +931,7 @@
+-IR::Container_ptr POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::defined_in (
++IR_Container_ptr POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::defined_in (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -1173,7 +1181,7 @@
CORBA::SystemException
))
{
@@ -786,7 +623,16 @@
ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -1233,7 +993,7 @@
+@@ -1227,7 +1235,7 @@
+ );
+ }
+
+-IR::Repository_ptr POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::containing_repository (
++IR_Repository_ptr POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::containing_repository (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -1235,7 +1243,7 @@
CORBA::SystemException
))
{
@@ -795,7 +641,16 @@
ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -1264,7 +1024,7 @@
+@@ -1258,7 +1266,7 @@
+ );
+ }
+
+-IR::Contained::Description * POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
++IR_Contained::Description * POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -1266,7 +1274,7 @@
CORBA::SystemException
))
{
@@ -804,7 +659,7 @@
ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -1289,7 +1049,7 @@
+@@ -1291,7 +1299,7 @@
void POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::move (
CORBA_Object *_collocated_tao_target_,
@@ -813,7 +668,7 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -1335,7 +1095,7 @@
+@@ -1337,7 +1345,7 @@
// copy ctor
POA_IR::Contained::Contained (const Contained& rhs)
@@ -822,999 +677,80 @@
TAO_ServantBase (rhs)
{}
-@@ -1346,806 +1106,268 @@
-
- void POA_IR::Contained::_get_id_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
- POA_IR::Contained *_tao_impl = (POA_IR::Contained *)_tao_object_reference;
-
- CORBA::String_var _tao_retval;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->id (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->id (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- char * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
- (_tao_out << _tao_retval.in ())
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
- void POA_IR::Contained::_set_id_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
+@@ -1832,7 +1840,7 @@
{
- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
POA_IR::Contained *_tao_impl = (POA_IR::Contained *)_tao_object_reference;
-
--_tao_server_request.argument_flag (0);
-- CORBA::String_var id;
-+ CORBA::String_var id;
- if (!(
- (_tao_in >> id.out ())
- ))
-- ACE_THROW (CORBA::MARSHAL());
-+ ACE_THROW (CORBA::MARSHAL () );
-
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_impl->id (
- id.in (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->id (
-- id.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- }
-
- void POA_IR::Contained::_get_name_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
- POA_IR::Contained *_tao_impl = (POA_IR::Contained *)_tao_object_reference;
-
- CORBA::String_var _tao_retval;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->name (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->name (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- char * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
- (_tao_out << _tao_retval.in ())
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
- void POA_IR::Contained::_set_name_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
- POA_IR::Contained *_tao_impl = (POA_IR::Contained *)_tao_object_reference;
-
--_tao_server_request.argument_flag (0);
-- CORBA::String_var name;
-+ CORBA::String_var name;
- if (!(
- (_tao_in >> name.out ())
- ))
-- ACE_THROW (CORBA::MARSHAL());
-+ ACE_THROW (CORBA::MARSHAL () );
-
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_impl->name (
- name.in (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->name (
-- name.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- }
-
- void POA_IR::Contained::_get_version_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
- POA_IR::Contained *_tao_impl = (POA_IR::Contained *)_tao_object_reference;
-
- CORBA::String_var _tao_retval;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->version (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->version (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- char * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
- (_tao_out << _tao_retval.in ())
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
- void POA_IR::Contained::_set_version_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
- POA_IR::Contained *_tao_impl = (POA_IR::Contained *)_tao_object_reference;
-
--_tao_server_request.argument_flag (0);
-- CORBA::String_var version;
-+ CORBA::String_var version;
- if (!(
- (_tao_in >> version.out ())
- ))
-- ACE_THROW (CORBA::MARSHAL());
-+ ACE_THROW (CORBA::MARSHAL () );
-
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_impl->version (
- version.in (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->version (
-- version.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- }
-
- void POA_IR::Contained::_get_defined_in_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
- POA_IR::Contained *_tao_impl = (POA_IR::Contained *)_tao_object_reference;
-
-- IR::Container_var _tao_retval;
+
+- IR::Container_var _tao_retval;
+ IR_Container_var _tao_retval;
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->defined_in (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->defined_in (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::Container_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
- (_tao_out << _tao_retval.in ())
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
- void POA_IR::Contained::_get_absolute_name_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -1859,7 +1867,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::Container_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_Container_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -1992,7 +2000,7 @@
{
POA_IR::Contained *_tao_impl = (POA_IR::Contained *)_tao_object_reference;
-
- CORBA::String_var _tao_retval;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->absolute_name (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->absolute_name (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- char * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
- (_tao_out << _tao_retval.in ())
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
- void POA_IR::Contained::_get_containing_repository_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
- POA_IR::Contained *_tao_impl = (POA_IR::Contained *)_tao_object_reference;
-
-- IR::Repository_var _tao_retval;
+
+- IR::Repository_var _tao_retval;
+ IR_Repository_var _tao_retval;
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->containing_repository (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->containing_repository (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::Repository_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
- (_tao_out << _tao_retval.in ())
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
- void POA_IR::Contained::describe_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -2019,7 +2027,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::Repository_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_Repository_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -2072,7 +2080,7 @@
{
POA_IR::Contained *_tao_impl = (POA_IR::Contained *)_tao_object_reference;
-
-- IR::Contained::Description_var _tao_retval;
+
+- IR::Contained::Description_var _tao_retval;
+ IR_Contained::Description_var _tao_retval;
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->describe (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->describe (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::Contained::Description * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
- (_tao_out << _tao_retval.in ())
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
- void POA_IR::Contained::move_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -2099,7 +2107,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::Contained::Description * _tao_retval_info = _tao_retval._retn ();
++ IR_Contained::Description * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -2154,7 +2162,7 @@
POA_IR::Contained *_tao_impl = (POA_IR::Contained *)_tao_object_reference;
-
--_tao_server_request.argument_flag (0);
+
+ _tao_server_request.argument_flag (0);
- IR::Container_var new_container;
-+ IR_Container_var new_container;
++ IR_Container_var new_container;
CORBA::String_var new_name;
CORBA::String_var new_version;
if (!(
-@@ -2153,76 +1375,22 @@
- (_tao_in >> new_name.out ()) &&
- (_tao_in >> new_version.out ())
- ))
-- ACE_THROW (CORBA::MARSHAL());
-+ ACE_THROW (CORBA::MARSHAL () );
-
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_move ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_impl->move (
- new_container.in (),
- new_name.in (),
- new_version.in (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->move (
-- new_container.in (),
-- new_name.in (),
-- new_version.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- }
-
- void POA_IR::Contained::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-@@ -2232,20 +1400,20 @@
+@@ -2241,7 +2249,7 @@
POA_IR::Contained *_tao_impl = (POA_IR::Contained *) _tao_object_reference;
CORBA::Boolean _tao_retval = 0;
CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
ACE_THROW (CORBA::MARSHAL ());
--
-+
+
_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -2249,7 +2257,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -1822,18 +758,8 @@
ACE_THROW (CORBA::MARSHAL ());
}
- void POA_IR::Contained::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-@@ -2254,10 +1422,10 @@
- POA_IR::Contained *_tao_impl = (POA_IR::Contained *) _tao_object_reference;
- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -2266,7 +2274,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -1841,7 +767,7 @@
ACE_THROW (CORBA::MARSHAL ());
}
-@@ -2282,7 +1450,7 @@
+@@ -2291,7 +2299,7 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
return ACE_static_cast (POA_IR::Contained_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
@@ -1850,7 +776,16 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
-@@ -2312,5350 +1480,3829 @@
+@@ -2307,7 +2315,7 @@
+ return "IDL:omg.org/IR/Contained:1.0";
+ }
+
+-IR::Contained*
++IR_Contained*
+ POA_IR::Contained::_this (CORBA_Environment &ACE_TRY_ENV)
+ {
+ TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+@@ -2321,10 +2329,9 @@
ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
CORBA::Object_var obj = tmp;
@@ -1859,9155 +794,1386 @@
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::TAO_ServerRequestInfo_IR_Contained_id_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+class TAO_IR_Container_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+private:
-+ unsigned int hash (const char *str, unsigned int len);
-+public:
-+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-+};
-+/* starting time is 11:23:09 */
-+/* C++ code produced by gperf version 2.8 (ACE version) */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_Container_Perfect_Hash_OpTable -N lookup */
-+unsigned int
-+TAO_IR_Container_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ static const unsigned char asso_values[] =
-+ {
-+#if defined (ACE_MVS)
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 15,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 0,
-+ 39, 0, 0, 0, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 0, 20, 5,
-+ 39, 0, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 10, 10, 39, 39, 39, 10, 0, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39,
-+#else
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 39, 39, 39, 15, 39, 0, 39, 0,
-+ 0, 0, 39, 39, 39, 39, 39, 39, 0, 20,
-+ 5, 39, 0, 39, 39, 10, 10, 39, 39, 39,
-+ 10, 0, 39, 39, 39, 39, 39, 39,
-+#endif /* ACE_MVS */
-+ };
-+ return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
--CORBA::Any *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+const class TAO_operation_db_entry *
-+TAO_IR_Container_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+ enum
-+ {
-+ TOTAL_KEYWORDS = 19,
-+ MIN_WORD_LENGTH = 5,
-+ MAX_WORD_LENGTH = 17,
-+ MIN_HASH_VALUE = 6,
-+ MAX_HASH_VALUE = 38,
-+ HASH_VALUE_RANGE = 33,
-+ DUPLICATES = 2
-+ };
-
--char *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ static const class TAO_operation_db_entry wordlist[] =
-+ {
-+ {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
-+ {"lookup", &POA_IR::Container::lookup_skel},
-+ {"destroy", &POA_IR::Container::destroy_skel},
-+ {"lookup_name", &POA_IR::Container::lookup_name_skel},
-+ {"create_value", &POA_IR::Container::create_value_skel},
-+ {"create_module", &POA_IR::Container::create_module_skel},
-+ {"create_native", &POA_IR::Container::create_native_skel},
-+ {"create_interface", &POA_IR::Container::create_interface_skel},
-+ {"create_union", &POA_IR::Container::create_union_skel},
-+ {"contents", &POA_IR::Container::contents_skel},
-+ {"_is_a", &POA_IR::Container::_is_a_skel},
-+ {"create_exception", &POA_IR::Container::create_exception_skel},
-+ {"create_alias", &POA_IR::Container::create_alias_skel},
-+ {"create_struct", &POA_IR::Container::create_struct_skel},
-+ {"create_constant", &POA_IR::Container::create_constant_skel},
-+ {"create_value_box", &POA_IR::Container::create_value_box_skel},
-+ {"describe_contents", &POA_IR::Container::describe_contents_skel},
-+ {"_get_def_kind", &POA_IR::Container::_get_def_kind_skel},
-+ {"create_enum", &POA_IR::Container::create_enum_skel},
-+ {"_non_existent", &POA_IR::Container::_non_existent_skel},
-+ };
-
--CORBA::Boolean
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+ static const signed char lookup[] =
-+ {
-+ -1, -1, -1, -1, -1, -1, 6, 7, -1, -10, -2, 8, 9, -42,
-+ -1, -1, 12, 13, 14, -1, 15, 16, 17, 18, -1, 19, 20, 21,
-+ 22, -1, -1, 23, -1, -1, -1, -1, -1, -1, 24,
-+ };
-
--void
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::result (char * result)
--{
-- // Update the result.
-- this->_result = result;
--}
-+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-+ {
-+ unsigned int key = hash (str, len);
-
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_set::TAO_ServerRequestInfo_IR_Contained_id_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
-- const char * id,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id)
--{}
-+ if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-+ {
-+ int slot = lookup[key];
-
--Dynamic::ParameterList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+ if (slot >= 0 && slot < MAX_HASH_VALUE)
-+ {
-+ const char *s = wordlist[slot].opname_;
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::TAO_ServerRequestInfo_IR_Contained_id_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -3073,7 +3080,7 @@
+ POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_move::TAO_ServerRequestInfo_IR_Contained_move (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::Contained *tao_impl,
+- IR::Container_ptr new_container,
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &
+@@ -3159,6 +3166,7 @@
+ }
--Dynamic::ExceptionList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-+ return &wordlist[slot];
-+ }
-+ else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-+ return 0;
-+ else
-+ {
-+ unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-+ const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-+ const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
-
--CORBA::Any *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
-+ while (--ptr >= base)
-+ if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-+ return ptr;
-+ }
-+ }
-+ }
-+ return 0;
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_Container_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+ {
+ private:
+@@ -3166,7 +3174,7 @@
+ public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 18:47:27 */
++/* starting time is 11:23:09 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_Container_Perfect_Hash_OpTable -N lookup */
+ unsigned int
+@@ -3296,10 +3304,9 @@
+ }
+ return 0;
}
+-/* ending time is 18:47:27 */
+/* ending time is 11:23:09 */
-+static TAO_IR_Container_Perfect_Hash_OpTable tao_IR_Container_optable;
+ static TAO_IR_Container_Perfect_Hash_OpTable tao_IR_Container_optable;
--char *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Implementation
-+//
-
--CORBA::Boolean
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+// Factory function Implementation.
-+POA_IR::_TAO_Container_Strategized_Proxy_Broker *POA_IR::_TAO_Container_Strategized_Proxy_Broker::the_TAO_Container_Strategized_Proxy_Broker (void)
- {
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ static POA_IR::_TAO_Container_Strategized_Proxy_Broker strategized_proxy_broker;
-+ return &strategized_proxy_broker;
- }
-
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get::TAO_ServerRequestInfo_IR_Contained_name_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
-
--Dynamic::ParameterList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+POA_IR::_TAO_Container_Strategized_Proxy_Broker::_TAO_Container_Strategized_Proxy_Broker (void)
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ this->proxy_cache_[i] = 0;
-
-- return parameter_list;
- }
-
--Dynamic::ExceptionList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+POA_IR::_TAO_Container_Strategized_Proxy_Broker::~_TAO_Container_Strategized_Proxy_Broker (void)
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ delete this->proxy_cache_[i];
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Implementation
+ //
+@@ -3325,9 +3332,9 @@
-- return exception_list;
}
--CORBA::Any *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
+-IR::_TAO_Container_Proxy_Impl&
+_TAO_Container_Proxy_Impl&
-+POA_IR::_TAO_Container_Strategized_Proxy_Broker::select_proxy (
+ POA_IR::_TAO_Container_Strategized_Proxy_Broker::select_proxy (
+- ::IR::Container *object,
+ IR_Container *object,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-+ TAO_ORB_Core::collocation_strategy (object);
-
-- CORBA::Any_var safe_result_any = result_any;
-+ if (this->proxy_cache_[strategy] != 0)
-+ return *this->proxy_cache_[strategy];
-
-- (*result_any) <<= this->_result;
-+ this->create_proxy (strategy, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-+
-+ return *this->proxy_cache_[strategy];
-
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
- }
-
- void
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get::result (char * result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_set::TAO_ServerRequestInfo_IR_Contained_name_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
-- const char * name,
-- CORBA::Environment &
-+POA_IR::_TAO_Container_Strategized_Proxy_Broker::create_proxy (
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA::Environment &ACE_TRY_ENV
)
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- name_ (name)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
-- return result_any;
--}
--
--char *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ if (this->proxy_cache_[strategy] == 0)
-+ {
-+ switch (strategy)
-+ {
-+ case TAO_ORB_Core::THRU_POA_STRATEGY:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+ {
+@@ -3359,7 +3366,7 @@
+ case TAO_ORB_Core::THRU_POA_STRATEGY:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- POA_IR::_TAO_Container_ThruPOA_Proxy_Impl,
+ _TAO_Container_ThruPOA_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ case TAO_ORB_Core::REMOTE_STRATEGY:
-+ default:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -3369,7 +3376,7 @@
+ default:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- ::IR::_TAO_Container_Remote_Proxy_Impl,
+ _TAO_Container_Remote_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ }
-+
-+ }
- }
-
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get::TAO_ServerRequestInfo_IR_Contained_version_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
-
--Dynamic::ParameterList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+//
-+// End Strategized Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-+
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -3386,26 +3393,26 @@
+ ///////////////////////////////////////////////////////////////////////
+
--Dynamic::ExceptionList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
+-IR::_TAO_Container_Proxy_Broker *
+-IR__TAO_Container_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_Container_Proxy_Broker *
+_TAO_Container_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ ACE_UNUSED_ARG (obj);
-+ return ::POA_IR::_TAO_Container_Strategized_Proxy_Broker::the_TAO_Container_Strategized_Proxy_Broker();
+ ACE_UNUSED_ARG (obj);
+ return ::POA_IR::_TAO_Container_Strategized_Proxy_Broker::the_TAO_Container_Strategized_Proxy_Broker();
}
--CORBA::Any *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+int
+ int
+-IR__TAO_Container_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_Container_Proxy_Broker_Factory_Initializer (long _dummy_)
{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
-+ ACE_UNUSED_ARG (_dummy_);
+ ACE_UNUSED_ARG (_dummy_);
-- (*result_any) <<= this->_result;
+- IR__TAO_Container_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_Container_Proxy_Broker_Factory_function;
+ _TAO_Container_Proxy_Broker_Factory_function_pointer =
+ _TAO_Container_Proxy_Broker_Factory_function;
-- return safe_result_any._retn ();
-+ return 0;
- }
-
--char *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+static int _TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-+ _TAO_Container_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_Container_Proxy_Broker_Factory_Initializer));
-
--CORBA::Boolean
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-
--void
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get::result (char * result)
--{
-- // Update the result.
-- this->_result = result;
--}
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Proxy Implementation
-+//
-
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_set::TAO_ServerRequestInfo_IR_Contained_version_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
-- const char * version,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- version_ (version)
-+POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::_TAO_Container_ThruPOA_Proxy_Impl (void)
- {}
-
--Dynamic::ParameterList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::~_TAO_Container_ThruPOA_Proxy_Impl (void)
-+{}
-
--CORBA::Boolean
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+// ThruPOA Implementation of the IDL interface methods
-
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get::TAO_ServerRequestInfo_IR_Contained_defined_in_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
-- CORBA::Environment &
-+IR::Contained_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * search_name,
-+ CORBA::Environment &ACE_TRY_ENV
- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
-+ IR_Contained_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "lookup",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Container_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Container:1.0"
-+ )
-+ )->lookup (
-+ search_name,
-+ ACE_TRY_ENV
-+ );
- }
-
--Dynamic::ExceptionList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR::ContainedSeq * POA_IR::_TAO_Container_ThruPOA_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
-+ ))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ IR_ContainedSeq_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "contents",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Container_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Container:1.0"
-+ )
-+ )->contents (
-+ limit_type,
-+ exclude_inherited,
-+ ACE_TRY_ENV
-+ );
- }
-
--CORBA::Any *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR::ContainedSeq * POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::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
-+ ))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
-+ IR_ContainedSeq_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "lookup_name",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Container_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Container:1.0"
-+ )
-+ )->lookup_name (
-+ search_name,
-+ levels_to_search,
-+ limit_type,
-+ exclude_inherited,
-+ ACE_TRY_ENV
-+ );
- }
-
--char *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR::Container::DescriptionSeq * POA_IR::_TAO_Container_ThruPOA_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
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ IR_Container::DescriptionSeq_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "describe_contents",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Container_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Container:1.0"
-+ )
-+ )->describe_contents (
-+ limit_type,
-+ exclude_inherited,
-+ max_returned_objs,
-+ ACE_TRY_ENV
-+ );
- }
-
--CORBA::Boolean
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get::target_is_a (
-+IR::ModuleDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-+ CORBA_Object *_collocated_tao_target_,
- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ const char * name,
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ IR_ModuleDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_module",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Container_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Container:1.0"
-+ )
-+ )->create_module (
-+ id,
-+ name,
-+ version,
-+ ACE_TRY_ENV
-+ );
- }
-
--void
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get::result (IR::Container_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get::TAO_ServerRequestInfo_IR_Contained_absolute_name_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
-- CORBA::Environment &
-+IR::ConstantDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::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_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ IR_ConstantDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_constant",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Container_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Container:1.0"
-+ )
-+ )->create_constant (
-+ id,
-+ name,
-+ version,
-+ type,
-+ value,
-+ ACE_TRY_ENV
-+ );
- }
-
--CORBA::Boolean
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get::target_is_a (
-+IR::StructDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-+ CORBA_Object *_collocated_tao_target_,
- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get::result (char * result)
-+ const char * name,
-+ const char * version,
-+ const IR_StructMemberSeq & members,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Update the result.
-- this->_result = result;
-+ IR_StructDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_struct",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Container_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Container:1.0"
-+ )
-+ )->create_struct (
-+ id,
-+ name,
-+ version,
-+ members,
-+ ACE_TRY_ENV
-+ );
- }
-
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get::TAO_ServerRequestInfo_IR_Contained_containing_repository_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
-- CORBA::Environment &
-+IR::UnionDef_ptr POA_IR::_TAO_Container_ThruPOA_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,
-+ CORBA::Environment &ACE_TRY_ENV
- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
-+ IR_UnionDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_union",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Container_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Container:1.0"
-+ )
-+ )->create_union (
-+ id,
-+ name,
-+ version,
-+ discriminator_type,
-+ members,
-+ ACE_TRY_ENV
-+ );
- }
-
--Dynamic::ExceptionList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR::EnumDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::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
-+ ))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ IR_EnumDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_enum",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Container_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Container:1.0"
-+ )
-+ )->create_enum (
-+ id,
-+ name,
-+ version,
-+ members,
-+ ACE_TRY_ENV
-+ );
- }
-
--CORBA::Any *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR::AliasDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::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
-+ ))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
-+ IR_AliasDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_alias",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Container_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Container:1.0"
-+ )
-+ )->create_alias (
-+ id,
-+ name,
-+ version,
-+ original_type,
-+ ACE_TRY_ENV
-+ );
- }
-
--char *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR::InterfaceDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::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
-+ ))
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ IR_InterfaceDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_interface",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Container_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Container:1.0"
-+ )
-+ )->create_interface (
-+ id,
-+ name,
-+ version,
-+ base_interfaces,
-+ is_abstract,
-+ is_local,
-+ ACE_TRY_ENV
-+ );
- }
-
--CORBA::Boolean
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get::target_is_a (
-+IR::ValueDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-+ CORBA_Object *_collocated_tao_target_,
- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ 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
-+ ))
- {
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ IR_ValueDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_value",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Container_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Container:1.0"
-+ )
-+ )->create_value (
-+ id,
-+ name,
-+ version,
-+ is_custom,
-+ is_abstract,
-+ base_value,
-+ is_truncatable,
-+ abstract_base_values,
-+ supported_interfaces,
-+ initializers,
-+ ACE_TRY_ENV
-+ );
- }
-
--void
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get::result (IR::Repository_ptr result)
-+IR::ValueBoxDef_ptr POA_IR::_TAO_Container_ThruPOA_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,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Update the result.
-- this->_result = result;
-+ IR_ValueBoxDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_value_box",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Container_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Container:1.0"
-+ )
-+ )->create_value_box (
-+ id,
-+ name,
-+ version,
-+ original_type_def,
-+ ACE_TRY_ENV
-+ );
- }
-
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe::TAO_ServerRequestInfo_IR_Contained_describe (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
-- CORBA::Environment &
-+IR::ExceptionDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::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_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
-+ IR_ExceptionDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_exception",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Container_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Container:1.0"
-+ )
-+ )->create_exception (
-+ id,
-+ name,
-+ version,
-+ members,
-+ ACE_TRY_ENV
-+ );
- }
-
--Dynamic::ExceptionList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR::NativeDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::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
-+ ))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ IR_NativeDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_native",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Container_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Container:1.0"
-+ )
-+ )->create_native (
-+ id,
-+ name,
-+ version,
-+ ACE_TRY_ENV
-+ );
- }
-
--CORBA::Any *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+//
-+// End ThruPOA Proxy Implementation
-+///////////////////////////////////////////////////////////////////////
-
--char *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+// skeleton constructor
-+POA_IR::Container::Container (void)
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ this->optable_ = &tao_IR_Container_optable;
- }
-
--CORBA::Boolean
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+// copy ctor
-+POA_IR::Container::Container (const Container& rhs)
-+ : POA_CORBA_IRObject (rhs),
-+ TAO_ServantBase (rhs)
-+{}
-
--void
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe::result (IR::Contained::Description * result)
-+// skeleton destructor
-+POA_IR::Container::~Container (void)
- {
-- // Update the result.
-- this->_result = result;
- }
-
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_move::TAO_ServerRequestInfo_IR_Contained_move (
-+void POA_IR::Container::lookup_skel (
- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
-- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- new_container_ (new_container),
-- new_name_ (new_name),
-- new_version_ (new_version)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_move::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_new_container = parameter_list->length ();
-- parameter_list->length (length_new_container + 1);
-- (*parameter_list)[length_new_container].argument <<= this->new_container_;
--
-- (*parameter_list)[length_new_container].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_new_name = parameter_list->length ();
-- parameter_list->length (length_new_name + 1);
-- (*parameter_list)[length_new_name].argument <<= new_name_;
-- (*parameter_list)[length_new_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_new_version = parameter_list->length ();
-- parameter_list->length (length_new_version + 1);
-- (*parameter_list)[length_new_version].argument <<= new_version_;
-- (*parameter_list)[length_new_version].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_move::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-
--CORBA::Any *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_move::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
-+ IR_Contained_var _tao_retval;
-+ CORBA::String_var search_name;
-+ if (!(
-+ (_tao_in >> search_name.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_retval = _tao_impl->lookup (
-+ search_name.in (),
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--char *
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_move::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::Container::contents_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-+
-+ IR_ContainedSeq_var _tao_retval;
-+ IR_DefinitionKind limit_type;
-+ CORBA::Boolean exclude_inherited;
-+ if (!(
-+ (_tao_in >> limit_type) &&
-+ (_tao_in >> CORBA::Any::to_boolean (exclude_inherited))
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_retval = _tao_impl->contents (
-+ limit_type,
-+ exclude_inherited,
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--CORBA::Boolean
--POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_move::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::Container::lookup_name_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-+
-+ IR_ContainedSeq_var _tao_retval;
-+ CORBA::String_var search_name;
-+ CORBA::Long levels_to_search;
-+ IR_DefinitionKind limit_type;
-+ CORBA::Boolean exclude_inherited;
-+ if (!(
-+ (_tao_in >> search_name.out ()) &&
-+ (_tao_in >> levels_to_search) &&
-+ (_tao_in >> limit_type) &&
-+ (_tao_in >> CORBA::Any::to_boolean (exclude_inherited))
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_retval = _tao_impl->lookup_name (
-+ search_name.in (),
-+ levels_to_search,
-+ limit_type,
-+ exclude_inherited,
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_Container_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
--{
--private:
-- unsigned int hash (const char *str, unsigned int len);
--public:
-- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
--};
--/* starting time is 16:31:12 */
--/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_Container_Perfect_Hash_OpTable -N lookup */
--unsigned int
--TAO_IR_Container_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+void POA_IR::Container::describe_contents_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- static const unsigned char asso_values[] =
-- {
--#if defined (ACE_MVS)
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 15,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 0,
-- 39, 0, 0, 0, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 0, 20, 5,
-- 39, 0, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 10, 10, 39, 39, 39, 10, 0, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39,
--#else
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-- 39, 39, 39, 39, 39, 15, 39, 0, 39, 0,
-- 0, 0, 39, 39, 39, 39, 39, 39, 0, 20,
-- 5, 39, 0, 39, 39, 10, 10, 39, 39, 39,
-- 10, 0, 39, 39, 39, 39, 39, 39,
--#endif /* ACE_MVS */
-- };
-- return len + asso_values[str[len - 1]] + asso_values[str[0]];
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-
--const class TAO_operation_db_entry *
--TAO_IR_Container_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
--{
-- enum
-- {
-- TOTAL_KEYWORDS = 19,
-- MIN_WORD_LENGTH = 5,
-- MAX_WORD_LENGTH = 17,
-- MIN_HASH_VALUE = 6,
-- MAX_HASH_VALUE = 38,
-- HASH_VALUE_RANGE = 33,
-- DUPLICATES = 2
-- };
-+ IR_Container::DescriptionSeq_var _tao_retval;
-+ IR_DefinitionKind limit_type;
-+ CORBA::Boolean exclude_inherited;
-+ CORBA::Long max_returned_objs;
-+ if (!(
-+ (_tao_in >> limit_type) &&
-+ (_tao_in >> CORBA::Any::to_boolean (exclude_inherited)) &&
-+ (_tao_in >> max_returned_objs)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
-- static const class TAO_operation_db_entry wordlist[] =
-- {
-- {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
-- {"lookup", &POA_IR::Container::lookup_skel},
-- {"destroy", &POA_IR::Container::destroy_skel},
-- {"lookup_name", &POA_IR::Container::lookup_name_skel},
-- {"create_value", &POA_IR::Container::create_value_skel},
-- {"create_module", &POA_IR::Container::create_module_skel},
-- {"create_native", &POA_IR::Container::create_native_skel},
-- {"create_interface", &POA_IR::Container::create_interface_skel},
-- {"create_union", &POA_IR::Container::create_union_skel},
-- {"contents", &POA_IR::Container::contents_skel},
-- {"_is_a", &POA_IR::Container::_is_a_skel},
-- {"create_exception", &POA_IR::Container::create_exception_skel},
-- {"create_alias", &POA_IR::Container::create_alias_skel},
-- {"create_struct", &POA_IR::Container::create_struct_skel},
-- {"create_constant", &POA_IR::Container::create_constant_skel},
-- {"create_value_box", &POA_IR::Container::create_value_box_skel},
-- {"describe_contents", &POA_IR::Container::describe_contents_skel},
-- {"_get_def_kind", &POA_IR::Container::_get_def_kind_skel},
-- {"create_enum", &POA_IR::Container::create_enum_skel},
-- {"_non_existent", &POA_IR::Container::_non_existent_skel},
-- };
-+ _tao_retval = _tao_impl->describe_contents (
-+ limit_type,
-+ exclude_inherited,
-+ max_returned_objs,
-+ ACE_TRY_ENV
-+ );
-
-- static const signed char lookup[] =
-- {
-- -1, -1, -1, -1, -1, -1, 6, 7, -1, -10, -2, 8, 9, -42,
-- -1, -1, 12, 13, 14, -1, 15, 16, 17, 18, -1, 19, 20, 21,
-- 22, -1, -1, 23, -1, -1, -1, -1, -1, -1, 24,
-- };
-+ ACE_CHECK;
-
-- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-- {
-- unsigned int key = hash (str, len);
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+}
-
-- if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-- {
-- int slot = lookup[key];
-+void POA_IR::Container::create_module_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-
-- if (slot >= 0 && slot < MAX_HASH_VALUE)
-- {
-- const char *s = wordlist[slot].opname_;
-+ IR_ModuleDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
-- if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-- return &wordlist[slot];
-- }
-- else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-- return 0;
-- else
-- {
-- unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-- const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-- const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
-+ _tao_retval = _tao_impl->create_module (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ ACE_TRY_ENV
-+ );
-
-- while (--ptr >= base)
-- if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-- return ptr;
-- }
-- }
-- }
-- return 0;
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
--/* ending time is 16:31:12 */
--static TAO_IR_Container_Perfect_Hash_OpTable tao_IR_Container_optable;
-
-+void POA_IR::Container::create_constant_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Implementation
--//
-+ IR_ConstantDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
-+ IR_IDLType_var type;
-+ CORBA::Any value;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> type.out ()) &&
-+ (_tao_in >> value)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--// Factory function Implementation.
--POA_IR::_TAO_Container_Strategized_Proxy_Broker *POA_IR::_TAO_Container_Strategized_Proxy_Broker::the_TAO_Container_Strategized_Proxy_Broker (void)
--{
-- static POA_IR::_TAO_Container_Strategized_Proxy_Broker strategized_proxy_broker;
-- return &strategized_proxy_broker;
--}
-+ _tao_retval = _tao_impl->create_constant (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ type.in (),
-+ value,
-+ ACE_TRY_ENV
-+ );
-
--POA_IR::_TAO_Container_Strategized_Proxy_Broker::_TAO_Container_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- this->proxy_cache_[i] = 0;
--
--}
-+ ACE_CHECK;
-
--POA_IR::_TAO_Container_Strategized_Proxy_Broker::~_TAO_Container_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- delete this->proxy_cache_[i];
--
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--IR::_TAO_Container_Proxy_Impl&
--POA_IR::_TAO_Container_Strategized_Proxy_Broker::select_proxy (
-- ::IR::Container *object,
-+void POA_IR::Container::create_struct_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-- TAO_ORB_Core::collocation_strategy (object);
--
-- if (this->proxy_cache_[strategy] != 0)
-- return *this->proxy_cache_[strategy];
--
-- this->create_proxy (strategy, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
--
-- return *this->proxy_cache_[strategy];
--
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-+
-+ IR_StructDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
-+ IR_StructMemberSeq members;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> members)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_retval = _tao_impl->create_struct (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ members,
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void
--POA_IR::_TAO_Container_Strategized_Proxy_Broker::create_proxy (
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-+void POA_IR::Container::create_union_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
--
-- if (this->proxy_cache_[strategy] == 0)
-- {
-- switch (strategy)
-- {
-- case TAO_ORB_Core::THRU_POA_STRATEGY:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- POA_IR::_TAO_Container_ThruPOA_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- case TAO_ORB_Core::REMOTE_STRATEGY:
-- default:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- ::IR::_TAO_Container_Remote_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- }
--
-- }
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-
-+ IR_UnionDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
-+ IR_IDLType_var discriminator_type;
-+ IR_UnionMemberSeq members;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> discriminator_type.out ()) &&
-+ (_tao_in >> members)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--//
--// End Strategized Proxy Broker Implementation
--///////////////////////////////////////////////////////////////////////
-+ _tao_retval = _tao_impl->create_union (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ discriminator_type.in (),
-+ members,
-+ ACE_TRY_ENV
-+ );
-
-+ ACE_CHECK;
-
--IR::_TAO_Container_Proxy_Broker *
--IR__TAO_Container_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
--{
-- ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_Container_Strategized_Proxy_Broker::the_TAO_Container_Strategized_Proxy_Broker();
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
+ return 0;
}
--int
--IR__TAO_Container_Proxy_Broker_Factory_Initializer (long _dummy_)
-+void POA_IR::Container::create_enum_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- ACE_UNUSED_ARG (_dummy_);
--
-- IR__TAO_Container_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_Container_Proxy_Broker_Factory_function;
--
-- return 0;
--}
--
-static int IR__TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- IR__TAO_Container_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_Container_Proxy_Broker_Factory_Initializer));
--
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
++static int _TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
++ _TAO_Container_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_Container_Proxy_Broker_Factory_Initializer));
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Proxy Implementation
--//
-+ IR_EnumDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
-+ IR_EnumMemberSeq members;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> members)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::_TAO_Container_ThruPOA_Proxy_Impl (void)
--{}
-+ _tao_retval = _tao_impl->create_enum (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ members,
-+ ACE_TRY_ENV
-+ );
--// ThruPOA Implementation of the IDL interface methods
-+ ACE_CHECK;
-
--IR::Contained_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
-- CORBA_Object *_collocated_tao_target_,
-- const char * search_name,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
+ ///////////////////////////////////////////////////////////////////////
+@@ -3426,7 +3433,7 @@
+ CORBA::SystemException
))
--{
+ {
- IR::Contained_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "lookup",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::Container_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Container:1.0"
-- )
-- )->lookup (
-- search_name,
-- ACE_TRY_ENV
-- );
-+ ACE_THROW (CORBA::MARSHAL () );
++ IR_Contained_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -3450,9 +3457,9 @@
+ );
}
-IR::ContainedSeq * POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-- CORBA_Object *_collocated_tao_target_,
++IR_ContainedSeq * POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::contents (
+ CORBA_Object *_collocated_tao_target_,
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-+void POA_IR::Container::create_alias_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+)
+ )
+@@ -3460,7 +3467,7 @@
+ CORBA::SystemException
+ ))
{
- IR::ContainedSeq_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "contents",
-- forward_to.out (),
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-+
-+ IR_AliasDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
-+ IR_IDLType_var original_type;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> original_type.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_retval = _tao_impl->create_alias (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ original_type.in (),
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::Container_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Container:1.0"
-- )
-- )->contents (
-- limit_type,
-- exclude_inherited,
-- ACE_TRY_ENV
-- );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
++ IR_ContainedSeq_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -3485,11 +3492,11 @@
+ );
}
-IR::ContainedSeq * POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-- CORBA_Object *_collocated_tao_target_,
-- const char * search_name,
-- CORBA::Long levels_to_search,
++IR_ContainedSeq * POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
+ CORBA_Object *_collocated_tao_target_,
+ const char * search_name,
+ CORBA::Long levels_to_search,
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-+void POA_IR::Container::create_interface_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+)
+ )
+@@ -3497,7 +3504,7 @@
+ CORBA::SystemException
+ ))
{
- IR::ContainedSeq_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "lookup_name",
-- forward_to.out (),
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-+
-+ IR_InterfaceDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
-+ IR_InterfaceDefSeq base_interfaces;
-+ CORBA::Boolean is_abstract;
-+ CORBA::Boolean is_local;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> base_interfaces) &&
-+ (_tao_in >> CORBA::Any::to_boolean (is_abstract)) &&
-+ (_tao_in >> CORBA::Any::to_boolean (is_local))
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_retval = _tao_impl->create_interface (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ base_interfaces,
-+ is_abstract,
-+ is_local,
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::Container_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Container:1.0"
-- )
-- )->lookup_name (
-- search_name,
-- levels_to_search,
-- limit_type,
-- exclude_inherited,
-- ACE_TRY_ENV
-- );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
++ IR_ContainedSeq_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -3524,9 +3531,9 @@
+ );
}
-IR::Container::DescriptionSeq * POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-- CORBA_Object *_collocated_tao_target_,
++IR_Container::DescriptionSeq * POA_IR::_TAO_Container_ThruPOA_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
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+void POA_IR::Container::create_value_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Long max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -3535,7 +3542,7 @@
+ CORBA::SystemException
+ ))
{
- IR::Container::DescriptionSeq_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "describe_contents",
-- forward_to.out (),
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-+
-+ IR_ValueDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
-+ CORBA::Boolean is_custom;
-+ CORBA::Boolean is_abstract;
-+ IR_ValueDef_var base_value;
-+ CORBA::Boolean is_truncatable;
-+ IR_ValueDefSeq abstract_base_values;
-+ IR_InterfaceDefSeq supported_interfaces;
-+ IR_InitializerSeq initializers;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> CORBA::Any::to_boolean (is_custom)) &&
-+ (_tao_in >> CORBA::Any::to_boolean (is_abstract)) &&
-+ (_tao_in >> base_value.out ()) &&
-+ (_tao_in >> CORBA::Any::to_boolean (is_truncatable)) &&
-+ (_tao_in >> abstract_base_values) &&
-+ (_tao_in >> supported_interfaces) &&
-+ (_tao_in >> initializers)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_retval = _tao_impl->create_value (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ is_custom,
-+ is_abstract,
-+ base_value.in (),
-+ is_truncatable,
-+ abstract_base_values,
-+ supported_interfaces,
-+ initializers,
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::Container_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Container:1.0"
-- )
-- )->describe_contents (
-- limit_type,
-- exclude_inherited,
-- max_returned_objs,
-- ACE_TRY_ENV
-- );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
++ IR_Container::DescriptionSeq_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -3561,7 +3568,7 @@
+ );
}
-IR::ModuleDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
-+void POA_IR::Container::create_value_box_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+)
++IR_ModuleDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+@@ -3572,7 +3579,7 @@
+ CORBA::SystemException
+ ))
{
- IR::ModuleDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_module",
-- forward_to.out (),
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-+
-+ IR_ValueBoxDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
-+ IR_IDLType_var original_type_def;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> original_type_def.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_retval = _tao_impl->create_value_box (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ original_type_def.in (),
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::Container_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Container:1.0"
-- )
-- )->create_module (
-- id,
-- name,
-- version,
-- ACE_TRY_ENV
-- );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
++ IR_ModuleDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -3598,12 +3605,12 @@
+ );
}
-IR::ConstantDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_ConstantDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
- IR::IDLType_ptr type,
-- const CORBA::Any & value,
-+void POA_IR::Container::create_exception_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
++ IR_IDLType_ptr type,
+ const CORBA::Any & value,
CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+)
+ )
+@@ -3611,7 +3618,7 @@
+ CORBA::SystemException
+ ))
{
- IR::ConstantDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_constant",
-- forward_to.out (),
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-+
-+ IR_ExceptionDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
-+ IR_StructMemberSeq members;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> members)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_retval = _tao_impl->create_exception (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ members,
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::Container_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Container:1.0"
-- )
-- )->create_constant (
-- id,
-- name,
-- version,
-- type,
-- value,
-- ACE_TRY_ENV
-- );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
++ IR_ConstantDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -3639,19 +3646,19 @@
+ );
}
-IR::StructDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_StructDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
- const IR::StructMemberSeq & members,
-+void POA_IR::Container::create_native_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
++ const IR_StructMemberSeq & members,
CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+)
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
{
- IR::StructDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_struct",
-- forward_to.out (),
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-+
-+ IR_NativeDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_retval = _tao_impl->create_native (
-+ id.in (),
-+ name.in (),
-+ version.in (),
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::Container_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Container:1.0"
-- )
-- )->create_struct (
-- id,
-- name,
-- version,
-- members,
-- ACE_TRY_ENV
-- );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
++ IR_StructDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -3678,20 +3685,20 @@
+ );
}
-IR::UnionDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_UnionDef_ptr POA_IR::_TAO_Container_ThruPOA_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,
-+void POA_IR::Container::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
++ IR_IDLType_ptr discriminator_type,
++ const IR_UnionMemberSeq & members,
CORBA::Environment &ACE_TRY_ENV
)
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
{
- IR::UnionDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_union",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::Container_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Container:1.0"
-- )
-- )->create_union (
-- id,
-- name,
-- version,
-- discriminator_type,
-- members,
-- ACE_TRY_ENV
-- );
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Container *_tao_impl = (POA_IR::Container *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = 0;
-+ CORBA::String_var value;
-+ if (!((_tao_in >> value.out ())))
-+ ACE_THROW (CORBA::MARSHAL ());
-+
-+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
++ IR_UnionDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -3719,19 +3726,19 @@
+ );
}
-IR::EnumDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_EnumDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
- const IR::EnumMemberSeq & members,
-+void POA_IR::Container::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
++ const IR_EnumMemberSeq & members,
CORBA::Environment &ACE_TRY_ENV
)
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
{
- IR::EnumDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_enum",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::Container_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Container:1.0"
-- )
-- )->create_enum (
-- id,
-- name,
-- version,
-- members,
-- ACE_TRY_ENV
-- );
-+ POA_IR::Container *_tao_impl = (POA_IR::Container *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
++ IR_EnumDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -3758,19 +3765,19 @@
+ );
}
-IR::AliasDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_AliasDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
- IR::IDLType_ptr original_type,
-+CORBA::Boolean POA_IR::Container::_is_a (
-+ const char* value,
++ IR_IDLType_ptr original_type,
CORBA::Environment &ACE_TRY_ENV
)
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
{
- IR::AliasDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_alias",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::Container_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Container:1.0"
-- )
-- )->create_alias (
-- id,
-- name,
-- version,
-- original_type,
-- 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-+ return 1;
-+ else
-+ return 0;
++ IR_AliasDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -3797,12 +3804,12 @@
+ );
}
-IR::InterfaceDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_InterfaceDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::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
-+void* POA_IR::Container::_downcast (
-+ const char* logical_type_id
- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -3811,7 +3818,7 @@
+ CORBA::SystemException
+ ))
{
- IR::InterfaceDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_interface",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::Container_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Container:1.0"
-- )
-- )->create_interface (
-- id,
-- name,
-- version,
-- base_interfaces,
-- is_abstract,
-- is_local,
-- ACE_TRY_ENV
-- );
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Container_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-+ return ACE_static_cast(PortableServer::Servant, this);
-+ return 0;
++ IR_InterfaceDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -3840,25 +3847,25 @@
+ );
}
-IR::ValueDef_ptr POA_IR::_TAO_Container_ThruPOA_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 POA_IR::_TAO_Container_ThruPOA_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,
-- CORBA::Boolean is_truncatable,
++ 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
-- ))
-+void POA_IR::Container::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
++ 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_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_value",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::Container_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Container:1.0"
-- )
-- )->create_value (
-- id,
-- name,
-- version,
-- is_custom,
-- is_abstract,
-- base_value,
-- is_truncatable,
-- abstract_base_values,
-- supported_interfaces,
-- initializers,
-- ACE_TRY_ENV
-- );
-+ this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
++ IR_ValueDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -3891,19 +3898,19 @@
+ );
}
-IR::ValueBoxDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_ValueBoxDef_ptr POA_IR::_TAO_Container_ThruPOA_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,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+const char* POA_IR::Container::_interface_repository_id (void) const
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
{
- IR::ValueBoxDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_value_box",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::Container_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Container:1.0"
-- )
-- )->create_value_box (
-- id,
-- name,
-- version,
-- original_type_def,
-- ACE_TRY_ENV
-- );
-+ return "IDL:omg.org/IR/Container:1.0";
++ IR_ValueBoxDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -3930,19 +3937,19 @@
+ );
}
-IR::ExceptionDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_ExceptionDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::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
-- ))
-+IR::Container*
-+POA_IR::Container::_this (CORBA_Environment &ACE_TRY_ENV)
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
{
- IR::ExceptionDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_exception",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::Container_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Container:1.0"
-- )
-- )->create_exception (
-- id,
-- name,
-- version,
-- members,
-- ACE_TRY_ENV
-- );
-+ TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (0);
-+
-+ CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-+
-+ if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-+ else
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-+
-+ CORBA::Object_var obj = tmp;
-+ return IR_Container::_unchecked_narrow (obj.in ());
++ IR_ExceptionDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -3969,7 +3976,7 @@
+ );
}
-IR::NativeDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::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
-- ))
-+class TAO_IR_IDLType_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
++IR_NativeDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+@@ -3980,7 +3987,7 @@
+ CORBA::SystemException
+ ))
{
- IR::NativeDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_native",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::Container_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Container:1.0"
-- )
-- )->create_native (
-- id,
-- name,
-- version,
-- ACE_TRY_ENV
-- );
-+private:
-+ unsigned int hash (const char *str, unsigned int len);
-+public:
-+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-+};
-+/* starting time is 11:23:09 */
-+/* C++ code produced by gperf version 2.8 (ACE version) */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_IDLType_Perfect_Hash_OpTable -N lookup */
-+unsigned int
-+TAO_IR_IDLType_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+{
-+ static const unsigned char asso_values[] =
-+ {
-+#if defined (ACE_MVS)
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 0,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 0,
-+ 19, 19, 0, 0, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 5, 19, 19, 19, 19, 0, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19,
-+#else
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 0, 19, 0, 19, 19,
-+ 0, 0, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 5, 19, 19, 19,
-+ 19, 0, 19, 19, 19, 19, 19, 19,
-+#endif /* ACE_MVS */
-+ };
-+ return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
--//
--// End ThruPOA Proxy Implementation
-+const class TAO_operation_db_entry *
-+TAO_IR_IDLType_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+{
-+ enum
-+ {
-+ TOTAL_KEYWORDS = 5,
-+ MIN_WORD_LENGTH = 5,
-+ MAX_WORD_LENGTH = 13,
-+ MIN_HASH_VALUE = 5,
-+ MAX_HASH_VALUE = 18,
-+ HASH_VALUE_RANGE = 14,
-+ DUPLICATES = 0
-+ };
-+
-+ static const class TAO_operation_db_entry wordlist[] =
-+ {
-+ {"",0},{"",0},{"",0},{"",0},{"",0},
-+ {"_is_a", &POA_IR::IDLType::_is_a_skel},
-+ {"",0},
-+ {"destroy", &POA_IR::IDLType::destroy_skel},
-+ {"",0},
-+ {"_get_type", &POA_IR::IDLType::_get_type_skel},
-+ {"",0},{"",0},{"",0},
-+ {"_get_def_kind", &POA_IR::IDLType::_get_def_kind_skel},
-+ {"",0},{"",0},{"",0},{"",0},
-+ {"_non_existent", &POA_IR::IDLType::_non_existent_skel},
-+ };
-+
-+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-+ {
-+ unsigned int key = hash (str, len);
-+
-+ if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-+ {
-+ const char *s = wordlist[key].opname_;
-+
-+ if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-+ return &wordlist[key];
-+ }
-+ }
-+ return 0;
-+}
-+/* ending time is 11:23:09 */
-+static TAO_IR_IDLType_Perfect_Hash_OpTable tao_IR_IDLType_optable;
-+
- ///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Implementation
-+//
-
--// skeleton constructor
--POA_IR::Container::Container (void)
-+// Factory function Implementation.
-+POA_IR::_TAO_IDLType_Strategized_Proxy_Broker *POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::the_TAO_IDLType_Strategized_Proxy_Broker (void)
- {
-- this->optable_ = &tao_IR_Container_optable;
-+ static POA_IR::_TAO_IDLType_Strategized_Proxy_Broker strategized_proxy_broker;
-+ return &strategized_proxy_broker;
- }
++ IR_NativeDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -4018,7 +4025,7 @@
--// copy ctor
--POA_IR::Container::Container (const Container& rhs)
+ // copy ctor
+ POA_IR::Container::Container (const Container& rhs)
- : ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-- TAO_ServantBase (rhs)
--{}
-+POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::_TAO_IDLType_Strategized_Proxy_Broker (void)
-+{
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ this->proxy_cache_[i] = 0;
-+
-+}
-
--// skeleton destructor
--POA_IR::Container::~Container (void)
-+POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::~_TAO_IDLType_Strategized_Proxy_Broker (void)
- {
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ delete this->proxy_cache_[i];
-+
- }
-
--void POA_IR::Container::lookup_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+_TAO_IDLType_Proxy_Impl&
-+POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::select_proxy (
-+ IR_IDLType *object,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
--
-- IR::Contained_var _tao_retval;
-- CORBA::String_var search_name;
-- if (!(
-- (_tao_in >> search_name.out ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-+ TAO_ORB_Core::collocation_strategy (object);
-
-- POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- search_name.in (),
-- ACE_TRY_ENV
-- );
-+ if (this->proxy_cache_[strategy] != 0)
-+ return *this->proxy_cache_[strategy];
-
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->lookup (
-- search_name.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::Contained_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
-+ this->create_proxy (strategy, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-+
-+ return *this->proxy_cache_[strategy];
-
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
- }
++ : POA_CORBA_IRObject (rhs),
+ TAO_ServantBase (rhs)
+ {}
--void POA_IR::Container::contents_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+void
-+POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::create_proxy (
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
--
-- IR::ContainedSeq_var _tao_retval;
+@@ -4037,14 +4044,13 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
+
+- IR::Contained_var _tao_retval;
++ IR_Contained_var _tao_retval;
+ CORBA::String_var search_name;
+ if (!(
+ (_tao_in >> search_name.out ())
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -4072,7 +4078,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::Contained_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_Contained_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -4126,8 +4132,8 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
+
+- IR::ContainedSeq_var _tao_retval;
- IR::DefinitionKind limit_type;
-- CORBA::Boolean exclude_inherited;
-- if (!(
-- (_tao_in >> limit_type) &&
-- (_tao_in >> CORBA::Any::to_boolean (exclude_inherited))
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
-+ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
-- POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- limit_type,
-- exclude_inherited,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->contents (
-- limit_type,
-- exclude_inherited,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ContainedSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-+ if (this->proxy_cache_[strategy] == 0)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+ switch (strategy)
-+ {
-+ case TAO_ORB_Core::THRU_POA_STRATEGY:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
-+ _TAO_IDLType_ThruPOA_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ case TAO_ORB_Core::REMOTE_STRATEGY:
-+ default:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
-+ _TAO_IDLType_Remote_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ }
-+
-+ }
-+}
-+
-+
-+//
-+// End Strategized Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-
-+_TAO_IDLType_Proxy_Broker *
-+_TAO_IDLType_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+{
-+ ACE_UNUSED_ARG (obj);
-+ return ::POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::the_TAO_IDLType_Strategized_Proxy_Broker();
- }
-
--void POA_IR::Container::lookup_name_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-+int
-+_TAO_IDLType_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-+ ACE_UNUSED_ARG (_dummy_);
-+
-+ _TAO_IDLType_Proxy_Broker_Factory_function_pointer =
-+ _TAO_IDLType_Proxy_Broker_Factory_function;
-+
-+ return 0;
-+}
-
-- IR::ContainedSeq_var _tao_retval;
-- CORBA::String_var search_name;
-- CORBA::Long levels_to_search;
++ IR_ContainedSeq_var _tao_retval;
++ IR_DefinitionKind limit_type;
+ CORBA::Boolean exclude_inherited;
+ if (!(
+ (_tao_in >> limit_type) &&
+@@ -4135,7 +4141,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -4165,7 +4170,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ContainedSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_ContainedSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -4219,10 +4224,10 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
+
+- IR::ContainedSeq_var _tao_retval;
++ IR_ContainedSeq_var _tao_retval;
+ CORBA::String_var search_name;
+ CORBA::Long levels_to_search;
- IR::DefinitionKind limit_type;
-- CORBA::Boolean exclude_inherited;
-- if (!(
-- (_tao_in >> search_name.out ()) &&
-- (_tao_in >> levels_to_search) &&
-- (_tao_in >> limit_type) &&
-- (_tao_in >> CORBA::Any::to_boolean (exclude_inherited))
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+static int _TAO_IDLType_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-+ _TAO_IDLType_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_IDLType_Proxy_Broker_Factory_Initializer));
-+
-+
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Proxy Implementation
-+//
-+
-+POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl::_TAO_IDLType_ThruPOA_Proxy_Impl (void)
-+{}
-
-+POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl::~_TAO_IDLType_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+// ThruPOA Implementation of the IDL interface methods
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-+CORBA::TypeCode_ptr POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl::type (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+ CORBA::TypeCode_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
--
-- POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- search_name.in (),
-- levels_to_search,
-- limit_type,
-- exclude_inherited,
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "type",
-+ forward_to.out (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->lookup_name (
-- search_name.in (),
-- levels_to_search,
-- limit_type,
-- exclude_inherited,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ContainedSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::IDLType_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/IDLType:1.0"
-+ )
-+ )->type (
- ACE_TRY_ENV
- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+}
-+
-+//
-+// End ThruPOA Proxy Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-+// skeleton constructor
-+POA_IR::IDLType::IDLType (void)
-+{
-+ this->optable_ = &tao_IR_IDLType_optable;
-+}
-+
-+// copy ctor
-+POA_IR::IDLType::IDLType (const IDLType& rhs)
-+ : POA_CORBA_IRObject (rhs),
-+ TAO_ServantBase (rhs)
-+{}
-
-+// skeleton destructor
-+POA_IR::IDLType::~IDLType (void)
-+{
- }
-
--void POA_IR::Container::describe_contents_skel (
-+void POA_IR::IDLType::_get_type_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
--
-- IR::Container::DescriptionSeq_var _tao_retval;
++ IR_DefinitionKind limit_type;
+ CORBA::Boolean exclude_inherited;
+ if (!(
+ (_tao_in >> search_name.out ()) &&
+@@ -4232,7 +4237,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -4266,7 +4270,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ContainedSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_ContainedSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -4320,8 +4324,8 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
+
+- IR::Container::DescriptionSeq_var _tao_retval;
- IR::DefinitionKind limit_type;
-- CORBA::Boolean exclude_inherited;
-- CORBA::Long max_returned_objs;
-- if (!(
-- (_tao_in >> limit_type) &&
-- (_tao_in >> CORBA::Any::to_boolean (exclude_inherited)) &&
-- (_tao_in >> max_returned_objs)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+ POA_IR::IDLType *_tao_impl = (POA_IR::IDLType *)_tao_object_reference;
-
-+ CORBA::TypeCode_var _tao_retval;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- limit_type,
-- exclude_inherited,
-- max_returned_objs,
-+ _tao_retval = _tao_impl->type (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->describe_contents (
-- limit_type,
-- exclude_inherited,
-- max_returned_objs,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::Container::DescriptionSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
++ IR_Container::DescriptionSeq_var _tao_retval;
++ IR_DefinitionKind limit_type;
+ CORBA::Boolean exclude_inherited;
+ CORBA::Long max_returned_objs;
if (!(
- (_tao_out << _tao_retval.in ())
+@@ -4331,7 +4335,6 @@
))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void POA_IR::Container::create_module_skel (
-+void POA_IR::IDLType::_is_a_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void * _tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -4363,7 +4366,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::Container::DescriptionSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_Container::DescriptionSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -4417,7 +4420,7 @@
TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
--
-- IR::ModuleDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ POA_IR::IDLType *_tao_impl = (POA_IR::IDLType *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = 0;
-+ CORBA::String_var value;
-+ if (!((_tao_in >> value.out ())))
-+ ACE_THROW (CORBA::MARSHAL ());
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_module (
-- id.in (),
-- name.in (),
-- version.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ModuleDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
- }
-
--void POA_IR::Container::create_constant_skel (
-+void POA_IR::IDLType::_non_existent_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void * _tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-+ POA_IR::IDLType *_tao_impl = (POA_IR::IDLType *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-+ ACE_CHECK;
-
-- IR::ConstantDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
+
+- IR::ModuleDef_var _tao_retval;
++ IR_ModuleDef_var _tao_retval;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
+@@ -4428,7 +4431,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -4460,7 +4462,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ModuleDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_ModuleDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -4514,11 +4516,11 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
+
+- IR::ConstantDef_var _tao_retval;
++ IR_ConstantDef_var _tao_retval;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
- IR::IDLType_var type;
-- CORBA::Any value;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> type.out ()) &&
-- (_tao_in >> value)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
-+}
-
-+CORBA::Boolean POA_IR::IDLType::_is_a (
-+ const 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-+ return 1;
-+ else
-+ return 0;
-+}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
-+void* POA_IR::IDLType::_downcast (
-+ const char* logical_type_id
-+ )
-+{
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-+ return ACE_static_cast (POA_IR::IDLType_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-+ return ACE_static_cast(PortableServer::Servant, this);
-+ return 0;
-+}
-+
-+void POA_IR::IDLType::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+{
-+ this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
-+}
-+
-+const char* POA_IR::IDLType::_interface_repository_id (void) const
-+{
-+ return "IDL:omg.org/IR/IDLType:1.0";
-+}
-+
-+IR::IDLType*
-+POA_IR::IDLType::_this (CORBA_Environment &ACE_TRY_ENV)
-+{
-+ TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (0);
-
-- POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- type.in (),
-- value,
-- ACE_TRY_ENV
-- );
-+ CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-+
-+ if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-+ else
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-
-- ACE_TRY
-+ CORBA::Object_var obj = tmp;
-+ return IR_IDLType::_unchecked_narrow (obj.in ());
-+}
-+
-+class TAO_IR_Repository_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+{
-+private:
-+ unsigned int hash (const char *str, unsigned int len);
-+public:
-+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-+};
-+/* starting time is 11:23:09 */
-+/* C++ code produced by gperf version 2.8 (ACE version) */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_Repository_Perfect_Hash_OpTable -N lookup */
-+unsigned int
-+TAO_IR_Repository_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+{
-+ static const unsigned char asso_values[] =
- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_constant (
-- id.in (),
-- name.in (),
-- version.in (),
-- type.in (),
-- value,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ConstantDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-+#if defined (ACE_MVS)
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 20,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 15,
-+ 71, 0, 23, 10, 71, 5, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 0, 0, 15,
-+ 71, 0, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 30, 0, 71, 71, 71, 0, 0, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71,
-+#else
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-+ 71, 71, 71, 71, 71, 20, 71, 15, 71, 0,
-+ 23, 10, 71, 5, 71, 71, 71, 71, 0, 0,
-+ 15, 71, 0, 71, 71, 30, 0, 71, 71, 71,
-+ 0, 0, 71, 71, 71, 71, 71, 71,
-+#endif /* ACE_MVS */
-+ };
-+ return len + asso_values[str[len - 1]] + asso_values[str[0]];
-+}
-+
-+const class TAO_operation_db_entry *
-+TAO_IR_Repository_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+{
-+ enum
- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-+ TOTAL_KEYWORDS = 27,
-+ MIN_WORD_LENGTH = 5,
-+ MAX_WORD_LENGTH = 22,
-+ MIN_HASH_VALUE = 6,
-+ MAX_HASH_VALUE = 70,
-+ HASH_VALUE_RANGE = 65,
-+ DUPLICATES = 2
-+ };
-+
-+ static const class TAO_operation_db_entry wordlist[] =
-+ {
-+ {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
-+ {"lookup", &POA_IR::Repository::lookup_skel},
-+ {"create_enum", &POA_IR::Repository::create_enum_skel},
-+ {"create_array", &POA_IR::Repository::create_array_skel},
-+ {"create_struct", &POA_IR::Repository::create_struct_skel},
-+ {"create_constant", &POA_IR::Repository::create_constant_skel},
-+ {"create_value_box", &POA_IR::Repository::create_value_box_skel},
-+ {"create_string", &POA_IR::Repository::create_string_skel},
-+ {"create_wstring", &POA_IR::Repository::create_wstring_skel},
-+ {"lookup_name", &POA_IR::Repository::lookup_name_skel},
-+ {"create_value", &POA_IR::Repository::create_value_skel},
-+ {"create_module", &POA_IR::Repository::create_module_skel},
-+ {"create_native", &POA_IR::Repository::create_native_skel},
-+ {"create_sequence", &POA_IR::Repository::create_sequence_skel},
-+ {"create_interface", &POA_IR::Repository::create_interface_skel},
-+ {"create_union", &POA_IR::Repository::create_union_skel},
-+ {"get_primitive", &POA_IR::Repository::get_primitive_skel},
-+ {"destroy", &POA_IR::Repository::destroy_skel},
-+ {"create_exception", &POA_IR::Repository::create_exception_skel},
-+ {"lookup_id", &POA_IR::Repository::lookup_id_skel},
-+ {"_non_existent", &POA_IR::Repository::_non_existent_skel},
-+ {"create_fixed", &POA_IR::Repository::create_fixed_skel},
-+ {"get_canonical_typecode", &POA_IR::Repository::get_canonical_typecode_skel},
-+ {"contents", &POA_IR::Repository::contents_skel},
-+ {"_is_a", &POA_IR::Repository::_is_a_skel},
-+ {"create_alias", &POA_IR::Repository::create_alias_skel},
-+ {"_get_def_kind", &POA_IR::Repository::_get_def_kind_skel},
-+ {"describe_contents", &POA_IR::Repository::describe_contents_skel},
-+ };
-+
-+ static const signed char lookup[] =
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ -1, -1, -1, -1, -1, -1, 6, -1, -1, -16, -2, 7, 8, 9,
-+ -1, 10, 11, -1, 12, 13, -1, 14, 15, -84, -1, 18, 19, 20,
-+ 21, -1, 22, 23, 24, 25, -1, 26, -1, 27, 28, -1, 29, -1,
-+ 30, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-+ 31, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-+ 32,
-+ };
-+
-+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-+ {
-+ unsigned int key = hash (str, len);
-+
-+ if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-+ {
-+ int slot = lookup[key];
-+
-+ if (slot >= 0 && slot < MAX_HASH_VALUE)
-+ {
-+ const char *s = wordlist[slot].opname_;
-+
-+ if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-+ return &wordlist[slot];
-+ }
-+ else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-+ return 0;
-+ else
-+ {
-+ unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-+ const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-+ const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
-+
-+ while (--ptr >= base)
-+ if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-+ return ptr;
-+ }
-+ }
- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
-+ return 0;
-+}
-+/* ending time is 11:23:09 */
-+static TAO_IR_Repository_Perfect_Hash_OpTable tao_IR_Repository_optable;
-+
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Implementation
-+//
-+
-+// Factory function Implementation.
-+POA_IR::_TAO_Repository_Strategized_Proxy_Broker *POA_IR::_TAO_Repository_Strategized_Proxy_Broker::the_TAO_Repository_Strategized_Proxy_Broker (void)
-+{
-+ static POA_IR::_TAO_Repository_Strategized_Proxy_Broker strategized_proxy_broker;
-+ return &strategized_proxy_broker;
-+}
-+
-+POA_IR::_TAO_Repository_Strategized_Proxy_Broker::_TAO_Repository_Strategized_Proxy_Broker (void)
-+{
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ this->proxy_cache_[i] = 0;
-
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+}
-
-+POA_IR::_TAO_Repository_Strategized_Proxy_Broker::~_TAO_Repository_Strategized_Proxy_Broker (void)
-+{
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ delete this->proxy_cache_[i];
-+
- }
-
--void POA_IR::Container::create_struct_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+_TAO_Repository_Proxy_Impl&
-+POA_IR::_TAO_Repository_Strategized_Proxy_Broker::select_proxy (
-+ IR_Repository *object,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
--
-- IR::StructDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
++ IR_IDLType_var type;
+ CORBA::Any value;
+ if (!(
+ (_tao_in >> id.out ()) &&
+@@ -4529,7 +4531,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -4565,7 +4566,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ConstantDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_ConstantDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -4619,11 +4620,11 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
+
+- IR::StructDef_var _tao_retval;
++ IR_StructDef_var _tao_retval;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
- IR::StructMemberSeq members;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> members)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-+ TAO_ORB_Core::collocation_strategy (object);
-
-- POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- members,
-- ACE_TRY_ENV
-- );
-+ if (this->proxy_cache_[strategy] != 0)
-+ return *this->proxy_cache_[strategy];
-
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_struct (
-- id.in (),
-- name.in (),
-- version.in (),
-- members,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::StructDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
-+ this->create_proxy (strategy, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-+
-+ return *this->proxy_cache_[strategy];
-
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
- }
-
--void POA_IR::Container::create_union_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+void
-+POA_IR::_TAO_Repository_Strategized_Proxy_Broker::create_proxy (
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
--
-- IR::UnionDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
++ IR_StructMemberSeq members;
+ if (!(
+ (_tao_in >> id.out ()) &&
+ (_tao_in >> name.out ()) &&
+@@ -4632,7 +4633,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -4666,7 +4666,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::StructDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_StructDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -4720,12 +4720,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
+
+- IR::UnionDef_var _tao_retval;
++ IR_UnionDef_var _tao_retval;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
- IR::IDLType_var discriminator_type;
- IR::UnionMemberSeq members;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> discriminator_type.out ()) &&
-- (_tao_in >> members)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
-+ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
-- POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- discriminator_type.in (),
-- members,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_union (
-- id.in (),
-- name.in (),
-- version.in (),
-- discriminator_type.in (),
-- members,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::UnionDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-+ if (this->proxy_cache_[strategy] == 0)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+ switch (strategy)
-+ {
-+ case TAO_ORB_Core::THRU_POA_STRATEGY:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
-+ _TAO_Repository_ThruPOA_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ case TAO_ORB_Core::REMOTE_STRATEGY:
-+ default:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
-+ _TAO_Repository_Remote_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ }
-+
-+ }
-+}
-+
-+
-+//
-+// End Strategized Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-
-+
-+_TAO_Repository_Proxy_Broker *
-+_TAO_Repository_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+{
-+ ACE_UNUSED_ARG (obj);
-+ return ::POA_IR::_TAO_Repository_Strategized_Proxy_Broker::the_TAO_Repository_Strategized_Proxy_Broker();
- }
-
--void POA_IR::Container::create_enum_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-+int
-+_TAO_Repository_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-+ ACE_UNUSED_ARG (_dummy_);
-+
-+ _TAO_Repository_Proxy_Broker_Factory_function_pointer =
-+ _TAO_Repository_Proxy_Broker_Factory_function;
-+
-+ return 0;
-+}
-
-- IR::EnumDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
++ IR_IDLType_var discriminator_type;
++ IR_UnionMemberSeq members;
+ if (!(
+ (_tao_in >> id.out ()) &&
+ (_tao_in >> name.out ()) &&
+@@ -4735,7 +4735,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -4771,7 +4770,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::UnionDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_UnionDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -4825,11 +4824,11 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
+
+- IR::EnumDef_var _tao_retval;
++ IR_EnumDef_var _tao_retval;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
- IR::EnumMemberSeq members;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> members)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+static int _TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-+ _TAO_Repository_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_Repository_Proxy_Broker_Factory_Initializer));
-+
-+
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Proxy Implementation
-+//
-
-+POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::_TAO_Repository_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::~_TAO_Repository_ThruPOA_Proxy_Impl (void)
-+{}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-+// ThruPOA Implementation of the IDL interface methods
-+
-+IR::Contained_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::lookup_id (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * search_id,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+ IR_Contained_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
--
-- POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- members,
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "lookup_id",
-+ forward_to.out (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_enum (
-- id.in (),
-- name.in (),
-- version.in (),
-- members,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::EnumDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Repository_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Repository:1.0"
-+ )
-+ )->lookup_id (
-+ search_id,
- ACE_TRY_ENV
- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
- }
-
--void POA_IR::Container::create_alias_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+CORBA::TypeCode_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::get_canonical_typecode (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::TypeCode_ptr tc,
- CORBA::Environment &ACE_TRY_ENV
- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
--
-- IR::AliasDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
++ IR_EnumMemberSeq members;
+ if (!(
+ (_tao_in >> id.out ()) &&
+ (_tao_in >> name.out ()) &&
+@@ -4838,7 +4837,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -4872,7 +4870,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::EnumDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_EnumDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -4926,11 +4924,11 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
+
+- IR::AliasDef_var _tao_retval;
++ IR_AliasDef_var _tao_retval;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
- IR::IDLType_var original_type;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> original_type.out ())
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
++ IR_IDLType_var original_type;
+ if (!(
+ (_tao_in >> id.out ()) &&
+ (_tao_in >> name.out ()) &&
+@@ -4939,7 +4937,6 @@
))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-+{
-+ CORBA::TypeCode_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
--
-- POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- original_type.in (),
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "get_canonical_typecode",
-+ forward_to.out (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_alias (
-- id.in (),
-- name.in (),
-- version.in (),
-- original_type.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::AliasDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Repository_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Repository:1.0"
-+ )
-+ )->get_canonical_typecode (
-+ tc,
- ACE_TRY_ENV
- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
- }
-
--void POA_IR::Container::create_interface_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+IR::PrimitiveDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::get_primitive (
-+ CORBA_Object *_collocated_tao_target_,
-+ IR_PrimitiveKind kind,
- CORBA::Environment &ACE_TRY_ENV
- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
--
-- IR::InterfaceDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -4973,7 +4970,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::AliasDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_AliasDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -5027,11 +5024,11 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
+
+- IR::InterfaceDef_var _tao_retval;
++ IR_InterfaceDef_var _tao_retval;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
- IR::InterfaceDefSeq base_interfaces;
-- CORBA::Boolean is_abstract;
-- CORBA::Boolean is_local;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> base_interfaces) &&
-- (_tao_in >> CORBA::Any::to_boolean (is_abstract)) &&
-- (_tao_in >> CORBA::Any::to_boolean (is_local))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
++ IR_InterfaceDefSeq base_interfaces;
+ CORBA::Boolean is_abstract;
+ CORBA::Boolean is_local;
+ if (!(
+@@ -5044,7 +5041,6 @@
))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-+{
-+ IR_PrimitiveDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
--
-- POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- base_interfaces,
-- is_abstract,
-- is_local,
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "get_primitive",
-+ forward_to.out (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_interface (
-- id.in (),
-- name.in (),
-- version.in (),
-- base_interfaces,
-- is_abstract,
-- is_local,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Repository_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Repository:1.0"
-+ )
-+ )->get_primitive (
-+ kind,
- ACE_TRY_ENV
- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
- }
-
--void POA_IR::Container::create_value_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+IR::StringDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_string (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::ULong bound,
- CORBA::Environment &ACE_TRY_ENV
- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
--
-- IR::ValueDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
-- CORBA::Boolean is_custom;
-- CORBA::Boolean is_abstract;
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -5082,7 +5078,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -5136,17 +5132,17 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
+
+- IR::ValueDef_var _tao_retval;
++ IR_ValueDef_var _tao_retval;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
+ CORBA::Boolean is_custom;
+ CORBA::Boolean is_abstract;
- IR::ValueDef_var base_value;
-- CORBA::Boolean is_truncatable;
++ IR_ValueDef_var base_value;
+ CORBA::Boolean is_truncatable;
- IR::ValueDefSeq abstract_base_values;
- IR::InterfaceDefSeq supported_interfaces;
- IR::InitializerSeq initializers;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> CORBA::Any::to_boolean (is_custom)) &&
-- (_tao_in >> CORBA::Any::to_boolean (is_abstract)) &&
-- (_tao_in >> base_value.out ()) &&
-- (_tao_in >> CORBA::Any::to_boolean (is_truncatable)) &&
-- (_tao_in >> abstract_base_values) &&
-- (_tao_in >> supported_interfaces) &&
-- (_tao_in >> initializers)
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
++ IR_ValueDefSeq abstract_base_values;
++ IR_InterfaceDefSeq supported_interfaces;
++ IR_InitializerSeq initializers;
+ if (!(
+ (_tao_in >> id.out ()) &&
+ (_tao_in >> name.out ()) &&
+@@ -5161,7 +5157,6 @@
))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-+{
-+ IR_StringDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
--
-- POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- is_custom,
-- is_abstract,
-- base_value.in (),
-- is_truncatable,
-- abstract_base_values,
-- supported_interfaces,
-- initializers,
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_string",
-+ forward_to.out (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_value (
-- id.in (),
-- name.in (),
-- version.in (),
-- is_custom,
-- is_abstract,
-- base_value.in (),
-- is_truncatable,
-- abstract_base_values,
-- supported_interfaces,
-- initializers,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Repository_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Repository:1.0"
-+ )
-+ )->create_string (
-+ bound,
- ACE_TRY_ENV
- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
- }
-
--void POA_IR::Container::create_value_box_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+IR::WstringDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_wstring (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::ULong bound,
- CORBA::Environment &ACE_TRY_ENV
- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
--
-- IR::ValueBoxDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -5207,7 +5202,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -5261,11 +5256,11 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
+
+- IR::ValueBoxDef_var _tao_retval;
++ IR_ValueBoxDef_var _tao_retval;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
- IR::IDLType_var original_type_def;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> original_type_def.out ())
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
++ IR_IDLType_var original_type_def;
+ if (!(
+ (_tao_in >> id.out ()) &&
+ (_tao_in >> name.out ()) &&
+@@ -5274,7 +5269,6 @@
))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-+{
-+ IR_WstringDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
--
-- POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- original_type_def.in (),
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_wstring",
-+ forward_to.out (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_value_box (
-- id.in (),
-- name.in (),
-- version.in (),
-- original_type_def.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ValueBoxDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Repository_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Repository:1.0"
-+ )
-+ )->create_wstring (
-+ bound,
- ACE_TRY_ENV
- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
- }
-
--void POA_IR::Container::create_exception_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+IR::SequenceDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_sequence (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::ULong bound,
-+ IR_IDLType_ptr element_type,
- CORBA::Environment &ACE_TRY_ENV
- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
--
-- IR::ExceptionDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -5308,7 +5302,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ValueBoxDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_ValueBoxDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -5362,11 +5356,11 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
+
+- IR::ExceptionDef_var _tao_retval;
++ IR_ExceptionDef_var _tao_retval;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
- IR::StructMemberSeq members;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> members)
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
++ IR_StructMemberSeq members;
+ if (!(
+ (_tao_in >> id.out ()) &&
+ (_tao_in >> name.out ()) &&
+@@ -5375,7 +5369,6 @@
))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-+{
-+ IR_SequenceDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
--
-- POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- members,
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_sequence",
-+ forward_to.out (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_exception (
-- id.in (),
-- name.in (),
-- version.in (),
-- members,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ExceptionDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Repository_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Repository:1.0"
-+ )
-+ )->create_sequence (
-+ bound,
-+ element_type,
- ACE_TRY_ENV
- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
- }
-
--void POA_IR::Container::create_native_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+IR::ArrayDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_array (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::ULong length,
-+ IR_IDLType_ptr element_type,
- CORBA::Environment &ACE_TRY_ENV
- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
--
-- IR::NativeDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ())
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -5409,7 +5402,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ExceptionDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_ExceptionDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -5463,7 +5456,7 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
+
+- IR::NativeDef_var _tao_retval;
++ IR_NativeDef_var _tao_retval;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
+@@ -5474,7 +5467,6 @@
))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-+{
-+ IR_ArrayDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
--
-- POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_array",
-+ forward_to.out (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_native (
-- id.in (),
-- name.in (),
-- version.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::NativeDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Repository_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Repository:1.0"
-+ )
-+ )->create_array (
-+ length,
-+ element_type,
- ACE_TRY_ENV
- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
- }
-
--void POA_IR::Container::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-+IR::FixedDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_fixed (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::UShort digits,
-+ CORBA::Short scale,
- CORBA::Environment &ACE_TRY_ENV
- )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Container *_tao_impl = (POA_IR::Container *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = 0;
-- CORBA::String_var value;
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -5506,7 +5498,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::NativeDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_NativeDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -5561,7 +5553,7 @@
+ POA_IR::Container *_tao_impl = (POA_IR::Container *) _tao_object_reference;
+ CORBA::Boolean _tao_retval = 0;
+ CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
-- ACE_THROW (CORBA::MARSHAL ());
--
-- _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
-+ IR_FixedDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_fixed",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::Repository_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/Repository:1.0"
-+ )
-+ )->create_fixed (
-+ digits,
-+ scale,
-+ ACE_TRY_ENV
-+ );
- }
-
--void POA_IR::Container::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::Container *_tao_impl = (POA_IR::Container *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
++ if (!((_tao_in >> value.out ())))
+ ACE_THROW (CORBA::MARSHAL ());
+
+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+@@ -5569,7 +5561,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
--}
-+//
-+// End ThruPOA Proxy Implementation
-+///////////////////////////////////////////////////////////////////////
-
--CORBA::Boolean POA_IR::Container::_is_a (
-- const char* value,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-+// skeleton constructor
-+POA_IR::Repository::Repository (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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-- return 1;
-- else
-- return 0;
-+ this->optable_ = &tao_IR_Repository_optable;
- }
-
--void* POA_IR::Container::_downcast (
-- const char* logical_type_id
-- )
--{
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-- return ACE_static_cast (POA_IR::Container_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-- return ACE_static_cast(PortableServer::Servant, this);
-- return 0;
--}
-+// copy ctor
-+POA_IR::Repository::Repository (const Repository& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-+ POA_CORBA_IRObject (rhs),
-+ TAO_ServantBase (rhs)
-+{}
-
--void POA_IR::Container::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+// skeleton destructor
-+POA_IR::Repository::~Repository (void)
- {
-- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
++ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
+ ACE_THROW (CORBA::MARSHAL ());
}
--const char* POA_IR::Container::_interface_repository_id (void) const
-+void POA_IR::Repository::lookup_id_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- return "IDL:omg.org/IR/Container:1.0";
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
+@@ -5586,7 +5578,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
++ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
+ ACE_THROW (CORBA::MARSHAL ());
+ }
--IR::Container*
--POA_IR::Container::_this (CORBA_Environment &ACE_TRY_ENV)
--{
-- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Object_ptr tmp = CORBA::Object::_nil ();
--
-- if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-- else
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
--
-- CORBA::Object_var obj = tmp;
+@@ -5611,7 +5603,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
+ return ACE_static_cast (POA_IR::Container_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
++ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+ return ACE_static_cast(PortableServer::Servant, this);
+ return 0;
+@@ -5641,10 +5633,9 @@
+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
+
+ CORBA::Object_var obj = tmp;
- return ::IR::Container::_unchecked_narrow (obj.in ());
--}
-+ IR_Contained_var _tao_retval;
-+ CORBA::String_var search_id;
-+ if (!(
-+ (_tao_in >> search_id.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
-+ _tao_retval = _tao_impl->lookup_id (
-+ search_id.in (),
-+ ACE_TRY_ENV
-+ );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::TAO_ServerRequestInfo_IR_Container_lookup (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * search_name,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- search_name_ (search_name)
--{}
-+ ACE_CHECK;
-
--Dynamic::ParameterList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_search_name = parameter_list->length ();
-- parameter_list->length (length_search_name + 1);
-- (*parameter_list)[length_search_name].argument <<= search_name_;
-- (*parameter_list)[length_search_name].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--Dynamic::ExceptionList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::Repository::get_canonical_typecode_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
-
--CORBA::Any *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+ CORBA::TypeCode_var _tao_retval;
-+ CORBA::TypeCode_var tc;
-+ if (!(
-+ (_tao_in >> tc.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--char *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ _tao_retval = _tao_impl->get_canonical_typecode (
-+ tc.in (),
-+ ACE_TRY_ENV
-+ );
-
--CORBA::Boolean
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+ ACE_CHECK;
++ return IR_Container::_unchecked_narrow (obj.in ());
+ }
--void
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::result (IR::Contained_ptr result)
--{
-- // Update the result.
-- this->_result = result;
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::TAO_ServerRequestInfo_IR_Container_contents (
-+void POA_IR::Repository::get_primitive_skel (
- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- IR::DefinitionKind & limit_type,
-- const CORBA::Boolean & exclude_inherited,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- limit_type_ (limit_type),
-- exclude_inherited_ (exclude_inherited)
--{}
-
--Dynamic::ParameterList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_limit_type = parameter_list->length ();
-- parameter_list->length (length_limit_type + 1);
-- (*parameter_list)[length_limit_type].argument <<= this->limit_type_;
--
-- (*parameter_list)[length_limit_type].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_exclude_inherited = parameter_list->length ();
-- parameter_list->length (length_exclude_inherited + 1);
-- (*parameter_list)[length_exclude_inherited].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
-- (*parameter_list)[length_exclude_inherited].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
-
--CORBA::Any *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+ IR_PrimitiveDef_var _tao_retval;
-+ IR_PrimitiveKind kind;
-+ if (!(
-+ (_tao_in >> kind)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--char *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ _tao_retval = _tao_impl->get_primitive (
-+ kind,
-+ ACE_TRY_ENV
-+ );
-
--CORBA::Boolean
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+ ACE_CHECK;
-
--void
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::result (IR::ContainedSeq * result)
--{
-- // Update the result.
-- this->_result = result;
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name::TAO_ServerRequestInfo_IR_Container_lookup_name (
-+void POA_IR::Repository::create_string_skel (
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::TAO_ServerRequestInfo_IR_Container_lookup (
+ TAO_ServerRequest &_tao_server_request,
+@@ -5733,7 +5724,7 @@
+ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::TAO_ServerRequestInfo_IR_Container_contents (
TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * search_name,
-- const CORBA::Long & levels_to_search,
+ POA_IR::Container *tao_impl,
- IR::DefinitionKind & limit_type,
-- const CORBA::Boolean & exclude_inherited,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- search_name_ (search_name),
-- levels_to_search_ (levels_to_search),
-- limit_type_ (limit_type),
-- exclude_inherited_ (exclude_inherited)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_search_name = parameter_list->length ();
-- parameter_list->length (length_search_name + 1);
-- (*parameter_list)[length_search_name].argument <<= search_name_;
-- (*parameter_list)[length_search_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_levels_to_search = parameter_list->length ();
-- parameter_list->length (length_levels_to_search + 1);
-- (*parameter_list)[length_levels_to_search].argument <<= levels_to_search_;
-- (*parameter_list)[length_levels_to_search].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_limit_type = parameter_list->length ();
-- parameter_list->length (length_limit_type + 1);
-- (*parameter_list)[length_limit_type].argument <<= this->limit_type_;
--
-- (*parameter_list)[length_limit_type].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_exclude_inherited = parameter_list->length ();
-- parameter_list->length (length_exclude_inherited + 1);
-- (*parameter_list)[length_exclude_inherited].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
-- (*parameter_list)[length_exclude_inherited].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
-
--CORBA::Any *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+ IR_StringDef_var _tao_retval;
-+ CORBA::ULong bound;
-+ if (!(
-+ (_tao_in >> bound)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--char *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ _tao_retval = _tao_impl->create_string (
-+ bound,
-+ ACE_TRY_ENV
-+ );
-
--CORBA::Boolean
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+ ACE_CHECK;
-
--void
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name::result (IR::ContainedSeq * result)
--{
-- // Update the result.
-- this->_result = result;
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::TAO_ServerRequestInfo_IR_Container_describe_contents (
-+void POA_IR::Repository::create_wstring_skel (
++ IR_DefinitionKind & limit_type,
+ const CORBA::Boolean & exclude_inherited,
+ CORBA::Environment &
+ )
+@@ -5827,7 +5818,7 @@
+ POA_IR::Container *tao_impl,
+ const char * search_name,
+ const CORBA::Long & levels_to_search,
+- IR::DefinitionKind & limit_type,
++ IR_DefinitionKind & limit_type,
+ const CORBA::Boolean & exclude_inherited,
+ CORBA::Environment &
+ )
+@@ -5931,7 +5922,7 @@
+ POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::TAO_ServerRequestInfo_IR_Container_describe_contents (
TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
+ POA_IR::Container *tao_impl,
- IR::DefinitionKind & limit_type,
-- const CORBA::Boolean & exclude_inherited,
-- const CORBA::Long & max_returned_objs,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- limit_type_ (limit_type),
-- exclude_inherited_ (exclude_inherited),
-- max_returned_objs_ (max_returned_objs)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_limit_type = parameter_list->length ();
-- parameter_list->length (length_limit_type + 1);
-- (*parameter_list)[length_limit_type].argument <<= this->limit_type_;
--
-- (*parameter_list)[length_limit_type].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_exclude_inherited = parameter_list->length ();
-- parameter_list->length (length_exclude_inherited + 1);
-- (*parameter_list)[length_exclude_inherited].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
-- (*parameter_list)[length_exclude_inherited].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_max_returned_objs = parameter_list->length ();
-- parameter_list->length (length_max_returned_objs + 1);
-- (*parameter_list)[length_max_returned_objs].argument <<= max_returned_objs_;
-- (*parameter_list)[length_max_returned_objs].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
-
--Dynamic::ExceptionList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ IR_WstringDef_var _tao_retval;
-+ CORBA::ULong bound;
-+ if (!(
-+ (_tao_in >> bound)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--CORBA::Any *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+ _tao_retval = _tao_impl->create_wstring (
-+ bound,
-+ ACE_TRY_ENV
-+ );
-
--char *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ ACE_CHECK;
-
--CORBA::Boolean
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::result (IR::Container::DescriptionSeq * result)
-+void POA_IR::Repository::create_sequence_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Update the result.
-- this->_result = result;
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
-
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module::TAO_ServerRequestInfo_IR_Container_create_module (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+ IR_SequenceDef_var _tao_retval;
-+ CORBA::ULong bound;
-+ IR_IDLType_var element_type;
-+ if (!(
-+ (_tao_in >> bound) &&
-+ (_tao_in >> element_type.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--Dynamic::ExceptionList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ _tao_retval = _tao_impl->create_sequence (
-+ bound,
-+ element_type.in (),
-+ ACE_TRY_ENV
-+ );
-
--CORBA::Any *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+ ACE_CHECK;
-
--char *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--CORBA::Boolean
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::Repository::create_array_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
-
--void
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module::result (IR::ModuleDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
-+ IR_ArrayDef_var _tao_retval;
-+ CORBA::ULong length;
-+ IR_IDLType_var element_type;
-+ if (!(
-+ (_tao_in >> length) &&
-+ (_tao_in >> element_type.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant::TAO_ServerRequestInfo_IR_Container_create_constant (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
++ IR_DefinitionKind & limit_type,
+ const CORBA::Boolean & exclude_inherited,
+ const CORBA::Long & max_returned_objs,
+ CORBA::Environment &
+@@ -6131,7 +6122,7 @@
+ const char * id,
+ const char * name,
+ const char * version,
- IR::IDLType_ptr type,
-- const CORBA::Any & value,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- type_ (type),
-- value_ (value)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_type = parameter_list->length ();
-- parameter_list->length (length_type + 1);
-- (*parameter_list)[length_type].argument <<= this->type_;
--
-- (*parameter_list)[length_type].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_value = parameter_list->length ();
-- parameter_list->length (length_value + 1);
-- (*parameter_list)[length_value].argument <<= value_;
-- (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+ _tao_retval = _tao_impl->create_array (
-+ length,
-+ element_type.in (),
-+ ACE_TRY_ENV
-+ );
-
--Dynamic::ExceptionList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ ACE_CHECK;
-
--CORBA::Any *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--char *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::Repository::create_fixed_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
-
--CORBA::Boolean
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+ IR_FixedDef_var _tao_retval;
-+ CORBA::UShort digits;
-+ CORBA::Short scale;
-+ if (!(
-+ (_tao_in >> digits) &&
-+ (_tao_in >> scale)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--void
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant::result (IR::ConstantDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
-+ _tao_retval = _tao_impl->create_fixed (
-+ digits,
-+ scale,
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct::TAO_ServerRequestInfo_IR_Container_create_struct (
-+void POA_IR::Repository::_is_a_skel (
- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
++ IR_IDLType_ptr type,
+ const CORBA::Any & value,
+ CORBA::Environment &
+ )
+@@ -6244,7 +6235,7 @@
+ const char * id,
+ const char * name,
+ const char * version,
- const IR::StructMemberSeq & members,
-- CORBA::Environment &
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &
)
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- members_ (members)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_members = parameter_list->length ();
-- parameter_list->length (length_members + 1);
-- (*parameter_list)[length_members].argument <<= this->members_;
--
-- (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+{
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::Repository *_tao_impl = (POA_IR::Repository *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = 0;
-+ CORBA::String_var value;
-+ if (!((_tao_in >> value.out ())))
-+ ACE_THROW (CORBA::MARSHAL ());
-+
-+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
- }
-
--Dynamic::ExceptionList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::Repository::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ POA_IR::Repository *_tao_impl = (POA_IR::Repository *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
- }
-
--CORBA::Any *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+CORBA::Boolean POA_IR::Repository::_is_a (
-+ const char* value,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
-+ 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-+ return 1;
-+ else
-+ return 0;
- }
-
--char *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void* POA_IR::Repository::_downcast (
-+ const char* logical_type_id
-+ )
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Repository:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Repository_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Container_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-+ return ACE_static_cast(PortableServer::Servant, this);
-+ return 0;
- }
-
--CORBA::Boolean
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::Repository::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--void
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct::result (IR::StructDef_ptr result)
-+const char* POA_IR::Repository::_interface_repository_id (void) const
- {
-- // Update the result.
-- this->_result = result;
-+ return "IDL:omg.org/IR/Repository:1.0";
- }
-
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union::TAO_ServerRequestInfo_IR_Container_create_union (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -6350,8 +6341,8 @@
+ const char * id,
+ const char * name,
+ const char * version,
- IR::IDLType_ptr discriminator_type,
- const IR::UnionMemberSeq & members,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- discriminator_type_ (discriminator_type),
-- members_ (members)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-+IR::Repository*
-+POA_IR::Repository::_this (CORBA_Environment &ACE_TRY_ENV)
-+{
-+ TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_discriminator_type = parameter_list->length ();
-- parameter_list->length (length_discriminator_type + 1);
-- (*parameter_list)[length_discriminator_type].argument <<= this->discriminator_type_;
-+ CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
-- (*parameter_list)[length_discriminator_type].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_members = parameter_list->length ();
-- parameter_list->length (length_members + 1);
-- (*parameter_list)[length_members].argument <<= this->members_;
-+ if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-+ else
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-
-- (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ CORBA::Object_var obj = tmp;
-+ return IR_Repository::_unchecked_narrow (obj.in ());
- }
-
--Dynamic::ExceptionList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+class TAO_IR_ComponentRepository_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+private:
-+ unsigned int hash (const char *str, unsigned int len);
-+public:
-+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-+};
-+/* starting time is 11:23:09 */
-+/* C++ code produced by gperf version 2.8 (ACE version) */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ComponentRepository_Perfect_Hash_OpTable -N lookup */
-+unsigned int
-+TAO_IR_ComponentRepository_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
-+ static const unsigned char asso_values[] =
-+ {
-+#if defined (ACE_MVS)
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 15,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 5,
-+ 54, 0, 25, 15, 54, 10, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 10, 0, 3,
-+ 54, 25, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 0, 5, 54, 54, 54, 0, 20, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54,
-+#else
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-+ 54, 54, 54, 54, 54, 15, 54, 5, 54, 0,
-+ 25, 15, 54, 10, 54, 54, 54, 54, 10, 0,
-+ 3, 54, 25, 54, 54, 0, 5, 54, 54, 54,
-+ 0, 20, 54, 54, 54, 54, 54, 54,
-+#endif /* ACE_MVS */
-+ };
-+ return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
--char *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+const class TAO_operation_db_entry *
-+TAO_IR_ComponentRepository_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ enum
-+ {
-+ TOTAL_KEYWORDS = 29,
-+ MIN_WORD_LENGTH = 5,
-+ MAX_WORD_LENGTH = 22,
-+ MIN_HASH_VALUE = 8,
-+ MAX_HASH_VALUE = 53,
-+ HASH_VALUE_RANGE = 46,
-+ DUPLICATES = 2
-+ };
-
--CORBA::Boolean
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+ static const class TAO_operation_db_entry wordlist[] =
-+ {
-+ {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
-+ {"contents", &POA_IR::ComponentRepository::contents_skel},
-+ {"create_enum", &POA_IR::ComponentRepository::create_enum_skel},
-+ {"create_alias", &POA_IR::ComponentRepository::create_alias_skel},
-+ {"create_union", &POA_IR::ComponentRepository::create_union_skel},
-+ {"create_value_box", &POA_IR::ComponentRepository::create_value_box_skel},
-+ {"create_struct", &POA_IR::ComponentRepository::create_struct_skel},
-+ {"create_exception", &POA_IR::ComponentRepository::create_exception_skel},
-+ {"create_constant", &POA_IR::ComponentRepository::create_constant_skel},
-+ {"create_component", &POA_IR::ComponentRepository::create_component_skel},
-+ {"create_string", &POA_IR::ComponentRepository::create_string_skel},
-+ {"create_wstring", &POA_IR::ComponentRepository::create_wstring_skel},
-+ {"_is_a", &POA_IR::ComponentRepository::_is_a_skel},
-+ {"create_home", &POA_IR::ComponentRepository::create_home_skel},
-+ {"create_value", &POA_IR::ComponentRepository::create_value_skel},
-+ {"create_module", &POA_IR::ComponentRepository::create_module_skel},
-+ {"create_native", &POA_IR::ComponentRepository::create_native_skel},
-+ {"create_sequence", &POA_IR::ComponentRepository::create_sequence_skel},
-+ {"create_interface", &POA_IR::ComponentRepository::create_interface_skel},
-+ {"create_array", &POA_IR::ComponentRepository::create_array_skel},
-+ {"_non_existent", &POA_IR::ComponentRepository::_non_existent_skel},
-+ {"lookup_name", &POA_IR::ComponentRepository::lookup_name_skel},
-+ {"create_fixed", &POA_IR::ComponentRepository::create_fixed_skel},
-+ {"get_primitive", &POA_IR::ComponentRepository::get_primitive_skel},
-+ {"lookup", &POA_IR::ComponentRepository::lookup_skel},
-+ {"describe_contents", &POA_IR::ComponentRepository::describe_contents_skel},
-+ {"lookup_id", &POA_IR::ComponentRepository::lookup_id_skel},
-+ {"get_canonical_typecode", &POA_IR::ComponentRepository::get_canonical_typecode_skel},
-+ {"destroy", &POA_IR::ComponentRepository::destroy_skel},
-+ {"_get_def_kind", &POA_IR::ComponentRepository::_get_def_kind_skel},
-+ };
-
--void
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union::result (IR::UnionDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
-+ static const signed char lookup[] =
-+ {
-+ -1, -1, -1, -1, -1, -1, -1, -1, 8, -1, -1, 9, 10, -22,
-+ -2, 11, 12, -1, 13, 14, 15, 16, -1, 17, 18, 19, 20, 21,
-+ -68, -1, 24, 25, 26, 27, -1, -1, 28, 29, 30, -1, -1, 31,
-+ 32, -1, 33, -1, -1, 34, -1, -1, -1, -1, 35, 36,
-+ };
-
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum::TAO_ServerRequestInfo_IR_Container_create_enum (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
++ IR_IDLType_ptr discriminator_type,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -6464,7 +6455,7 @@
+ const char * id,
+ const char * name,
+ const char * version,
- const IR::EnumMemberSeq & members,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- members_ (members)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_members = parameter_list->length ();
-- parameter_list->length (length_members + 1);
-- (*parameter_list)[length_members].argument <<= this->members_;
--
-- (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-+ {
-+ unsigned int key = hash (str, len);
-
--Dynamic::ExceptionList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-+ {
-+ int slot = lookup[key];
-
--CORBA::Any *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+ if (slot >= 0 && slot < MAX_HASH_VALUE)
-+ {
-+ const char *s = wordlist[slot].opname_;
-
--char *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-+ return &wordlist[slot];
-+ }
-+ else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-+ return 0;
-+ else
-+ {
-+ unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-+ const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-+ const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
-
--CORBA::Boolean
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ while (--ptr >= base)
-+ if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-+ return ptr;
-+ }
-+ }
-+ }
-+ return 0;
- }
-+/* ending time is 11:23:09 */
-+static TAO_IR_ComponentRepository_Perfect_Hash_OpTable tao_IR_ComponentRepository_optable;
-
--void
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum::result (IR::EnumDef_ptr result)
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Implementation
-+//
-+
-+// Factory function Implementation.
-+POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker *POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::the_TAO_ComponentRepository_Strategized_Proxy_Broker (void)
- {
-- // Update the result.
-- this->_result = result;
-+ static POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker strategized_proxy_broker;
-+ return &strategized_proxy_broker;
- }
-
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias::TAO_ServerRequestInfo_IR_Container_create_alias (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -6570,7 +6561,7 @@
+ const char * id,
+ const char * name,
+ const char * version,
- IR::IDLType_ptr original_type,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- original_type_ (original_type)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_original_type = parameter_list->length ();
-- parameter_list->length (length_original_type + 1);
-- (*parameter_list)[length_original_type].argument <<= this->original_type_;
--
-- (*parameter_list)[length_original_type].mode = Dynamic::PARAM_IN;
-+POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::_TAO_ComponentRepository_Strategized_Proxy_Broker (void)
-+{
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ this->proxy_cache_[i] = 0;
-
-- return safe_parameter_list._retn ();
- }
-
--Dynamic::ExceptionList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::~_TAO_ComponentRepository_Strategized_Proxy_Broker (void)
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ delete this->proxy_cache_[i];
-
-- return exception_list;
- }
-
--CORBA::Any *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+_TAO_ComponentRepository_Proxy_Impl&
-+POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::select_proxy (
-+ IR_ComponentRepository *object,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-+ TAO_ORB_Core::collocation_strategy (object);
-
-- CORBA::Any_var safe_result_any = result_any;
-+ if (this->proxy_cache_[strategy] != 0)
-+ return *this->proxy_cache_[strategy];
-
-- (*result_any) <<= this->_result;
-+ this->create_proxy (strategy, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-+
-+ return *this->proxy_cache_[strategy];
-
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
- }
-
- void
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias::result (IR::AliasDef_ptr result)
-+POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::create_proxy (
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface::TAO_ServerRequestInfo_IR_Container_create_interface (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
++ IR_IDLType_ptr original_type,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -6676,7 +6667,7 @@
+ 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_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- base_interfaces_ (base_interfaces),
-- is_abstract_ (is_abstract),
-- is_local_ (is_local)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_base_interfaces = parameter_list->length ();
-- parameter_list->length (length_base_interfaces + 1);
-- (*parameter_list)[length_base_interfaces].argument <<= this->base_interfaces_;
-+ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
-- (*parameter_list)[length_base_interfaces].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_is_abstract = parameter_list->length ();
-- parameter_list->length (length_is_abstract + 1);
-- (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
-- (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN;
-+ if (this->proxy_cache_[strategy] == 0)
-+ {
-+ switch (strategy)
-+ {
-+ case TAO_ORB_Core::THRU_POA_STRATEGY:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
-+ _TAO_ComponentRepository_ThruPOA_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ case TAO_ORB_Core::REMOTE_STRATEGY:
-+ default:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
-+ _TAO_ComponentRepository_Remote_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ }
-
-- CORBA::ULong length_is_local = parameter_list->length ();
-- parameter_list->length (length_is_local + 1);
-- (*parameter_list)[length_is_local].argument <<= CORBA::Any::from_boolean (this->is_local_);
-- (*parameter_list)[length_is_local].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ }
- }
-
--Dynamic::ExceptionList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+
-+//
-+// End Strategized Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-+
-+_TAO_ComponentRepository_Proxy_Broker *
-+_TAO_ComponentRepository_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ ACE_UNUSED_ARG (obj);
-+ return ::POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::the_TAO_ComponentRepository_Strategized_Proxy_Broker();
- }
-
--CORBA::Any *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+int
-+_TAO_ComponentRepository_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
-+ ACE_UNUSED_ARG (_dummy_);
-
-- (*result_any) <<= this->_result;
-+ _TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer =
-+ _TAO_ComponentRepository_Proxy_Broker_Factory_function;
-
-- return safe_result_any._retn ();
-+ return 0;
- }
-
--char *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+static int _TAO_ComponentRepository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-+ _TAO_ComponentRepository_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ComponentRepository_Proxy_Broker_Factory_Initializer));
-
--CORBA::Boolean
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface::result (IR::InterfaceDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value::TAO_ServerRequestInfo_IR_Container_create_value (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
-- const CORBA::Boolean & is_custom,
-- const CORBA::Boolean & is_abstract,
++ const IR_InterfaceDefSeq & base_interfaces,
+ const CORBA::Boolean & is_abstract,
+ const CORBA::Boolean & is_local,
+ CORBA::Environment &
+@@ -6798,11 +6789,11 @@
+ const char * version,
+ const CORBA::Boolean & is_custom,
+ const CORBA::Boolean & is_abstract,
- IR::ValueDef_ptr base_value,
-- const CORBA::Boolean & is_truncatable,
++ 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_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- 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 *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_is_custom = parameter_list->length ();
-- parameter_list->length (length_is_custom + 1);
-- (*parameter_list)[length_is_custom].argument <<= CORBA::Any::from_boolean (this->is_custom_);
-- (*parameter_list)[length_is_custom].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_is_abstract = parameter_list->length ();
-- parameter_list->length (length_is_abstract + 1);
-- (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
-- (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_base_value = parameter_list->length ();
-- parameter_list->length (length_base_value + 1);
-- (*parameter_list)[length_base_value].argument <<= this->base_value_;
--
-- (*parameter_list)[length_base_value].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_is_truncatable = parameter_list->length ();
-- parameter_list->length (length_is_truncatable + 1);
-- (*parameter_list)[length_is_truncatable].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
-- (*parameter_list)[length_is_truncatable].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_abstract_base_values = parameter_list->length ();
-- parameter_list->length (length_abstract_base_values + 1);
-- (*parameter_list)[length_abstract_base_values].argument <<= this->abstract_base_values_;
--
-- (*parameter_list)[length_abstract_base_values].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_supported_interfaces = parameter_list->length ();
-- parameter_list->length (length_supported_interfaces + 1);
-- (*parameter_list)[length_supported_interfaces].argument <<= this->supported_interfaces_;
--
-- (*parameter_list)[length_supported_interfaces].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_initializers = parameter_list->length ();
-- parameter_list->length (length_initializers + 1);
-- (*parameter_list)[length_initializers].argument <<= this->initializers_;
--
-- (*parameter_list)[length_initializers].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-
--CORBA::Any *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Proxy Implementation
-+//
-
--char *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::_TAO_ComponentRepository_ThruPOA_Proxy_Impl (void)
-+{}
-
--CORBA::Boolean
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::~_TAO_ComponentRepository_ThruPOA_Proxy_Impl (void)
-+{}
-
--void
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value::result (IR::ValueDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
-+// ThruPOA Implementation of the IDL interface methods
-
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box::TAO_ServerRequestInfo_IR_Container_create_value_box (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-+IR::ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_component (
-+ CORBA_Object *_collocated_tao_target_,
++ const IR_ValueDefSeq & abstract_base_values,
++ const IR_InterfaceDefSeq & supported_interfaces,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -6947,7 +6938,7 @@
const char * id,
const char * name,
const char * version,
- IR::IDLType_ptr original_type_def,
-- CORBA::Environment &
-+ IR_ComponentDef_ptr base_component,
-+ const IR_InterfaceDefSeq & supports_interfaces,
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &
)
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- original_type_def_ (original_type_def)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_original_type_def = parameter_list->length ();
-- parameter_list->length (length_original_type_def + 1);
-- (*parameter_list)[length_original_type_def].argument <<= this->original_type_def_;
--
-- (*parameter_list)[length_original_type_def].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box::result (IR::ValueBoxDef_ptr result)
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Update the result.
-- this->_result = result;
-+ IR_ComponentDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_component",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ComponentRepository_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ComponentRepository:1.0"
-+ )
-+ )->create_component (
-+ id,
-+ name,
-+ version,
-+ base_component,
-+ supports_interfaces,
-+ ACE_TRY_ENV
-+ );
- }
-
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception::TAO_ServerRequestInfo_IR_Container_create_exception (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-+IR::HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home (
-+ CORBA_Object *_collocated_tao_target_,
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -7053,7 +7044,7 @@
const char * id,
const char * name,
const char * version,
- const IR::StructMemberSeq & members,
-- CORBA::Environment &
-+ IR_HomeDef_ptr base_home,
-+ IR_ComponentDef_ptr managed_component,
-+ IR_ValueDef_ptr primary_key,
-+ CORBA::Environment &ACE_TRY_ENV
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &
)
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- members_ (members)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_members = parameter_list->length ();
-- parameter_list->length (length_members + 1);
-- (*parameter_list)[length_members].argument <<= this->members_;
--
-- (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ IR_HomeDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_home",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ComponentRepository_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ComponentRepository:1.0"
-+ )
-+ )->create_home (
-+ id,
-+ name,
-+ version,
-+ base_home,
-+ managed_component,
-+ primary_key,
-+ ACE_TRY_ENV
-+ );
- }
-
--CORBA::Any *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+//
-+// End ThruPOA Proxy Implementation
-+///////////////////////////////////////////////////////////////////////
-
--char *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+// skeleton constructor
-+POA_IR::ComponentRepository::ComponentRepository (void)
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ this->optable_ = &tao_IR_ComponentRepository_optable;
- }
-
--CORBA::Boolean
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+// copy ctor
-+POA_IR::ComponentRepository::ComponentRepository (const ComponentRepository& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,Repository) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-+ POA_CORBA_IRObject (rhs),
-+ TAO_ServantBase (rhs)
-+{}
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -7252,6 +7243,7 @@
+ }
--void
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception::result (IR::ExceptionDef_ptr result)
-+// skeleton destructor
-+POA_IR::ComponentRepository::~ComponentRepository (void)
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_IDLType_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
-- // Update the result.
-- this->_result = result;
+ private:
+@@ -7259,7 +7251,7 @@
+ public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 18:47:27 */
++/* starting time is 11:23:09 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_IDLType_Perfect_Hash_OpTable -N lookup */
+ unsigned int
+@@ -7355,10 +7347,9 @@
+ }
+ return 0;
}
+-/* ending time is 18:47:27 */
++/* ending time is 11:23:09 */
+ static TAO_IR_IDLType_Perfect_Hash_OpTable tao_IR_IDLType_optable;
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native::TAO_ServerRequestInfo_IR_Container_create_native (
-+void POA_IR::ComponentRepository::create_component_skel (
- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *)_tao_object_reference;
-
--CORBA::Any *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+ IR_ComponentDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
-+ IR_ComponentDef_var base_component;
-+ IR_InterfaceDefSeq supports_interfaces;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> base_component.out ()) &&
-+ (_tao_in >> supports_interfaces)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--char *
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ _tao_retval = _tao_impl->create_component (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ base_component.in (),
-+ supports_interfaces,
-+ ACE_TRY_ENV
-+ );
-
--CORBA::Boolean
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+ ACE_CHECK;
-
--void
--POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native::result (IR::NativeDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_IDLType_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+void POA_IR::ComponentRepository::create_home_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
--private:
-- unsigned int hash (const char *str, unsigned int len);
--public:
-- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
--};
--/* starting time is 16:31:12 */
--/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_IDLType_Perfect_Hash_OpTable -N lookup */
--unsigned int
--TAO_IR_IDLType_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
--{
-- static const unsigned char asso_values[] =
-- {
--#if defined (ACE_MVS)
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 0,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 0,
-- 19, 19, 0, 0, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 5, 19, 19, 19, 19, 0, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19,
--#else
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 0, 19, 0, 19, 19,
-- 0, 0, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 5, 19, 19, 19,
-- 19, 0, 19, 19, 19, 19, 19, 19,
--#endif /* ACE_MVS */
-- };
-- return len + asso_values[str[len - 1]] + asso_values[str[0]];
--}
-
--const class TAO_operation_db_entry *
--TAO_IR_IDLType_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
--{
-- enum
-- {
-- TOTAL_KEYWORDS = 5,
-- MIN_WORD_LENGTH = 5,
-- MAX_WORD_LENGTH = 13,
-- MIN_HASH_VALUE = 5,
-- MAX_HASH_VALUE = 18,
-- HASH_VALUE_RANGE = 14,
-- DUPLICATES = 0
-- };
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *)_tao_object_reference;
-
-- static const class TAO_operation_db_entry wordlist[] =
-- {
-- {"",0},{"",0},{"",0},{"",0},{"",0},
-- {"_is_a", &POA_IR::IDLType::_is_a_skel},
-- {"",0},
-- {"destroy", &POA_IR::IDLType::destroy_skel},
-- {"",0},
-- {"_get_type", &POA_IR::IDLType::_get_type_skel},
-- {"",0},{"",0},{"",0},
-- {"_get_def_kind", &POA_IR::IDLType::_get_def_kind_skel},
-- {"",0},{"",0},{"",0},{"",0},
-- {"_non_existent", &POA_IR::IDLType::_non_existent_skel},
-- };
-+ IR_HomeDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
-+ IR_HomeDef_var base_home;
-+ IR_ComponentDef_var managed_component;
-+ IR_ValueDef_var primary_key;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> base_home.out ()) &&
-+ (_tao_in >> managed_component.out ()) &&
-+ (_tao_in >> primary_key.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
-- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-- {
-- unsigned int key = hash (str, len);
-+ _tao_retval = _tao_impl->create_home (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ base_home.in (),
-+ managed_component.in (),
-+ primary_key.in (),
-+ ACE_TRY_ENV
-+ );
-
-- if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-- {
-- const char *s = wordlist[key].opname_;
-+ ACE_CHECK;
-
-- if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-- return &wordlist[key];
-- }
-- }
-- return 0;
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
--/* ending time is 16:31:12 */
--static TAO_IR_IDLType_Perfect_Hash_OpTable tao_IR_IDLType_optable;
-
-+void POA_IR::ComponentRepository::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+{
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = 0;
-+ CORBA::String_var value;
-+ if (!((_tao_in >> value.out ())))
-+ ACE_THROW (CORBA::MARSHAL ());
-
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Implementation
--//
-+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-+ ACE_CHECK;
-
--// Factory function Implementation.
--POA_IR::_TAO_IDLType_Strategized_Proxy_Broker *POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::the_TAO_IDLType_Strategized_Proxy_Broker (void)
--{
-- static POA_IR::_TAO_IDLType_Strategized_Proxy_Broker strategized_proxy_broker;
-- return &strategized_proxy_broker;
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
- }
-
--POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::_TAO_IDLType_Strategized_Proxy_Broker (void)
-+void POA_IR::ComponentRepository::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- this->proxy_cache_[i] = 0;
--
--}
-+ POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-+ ACE_CHECK;
-
--POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::~_TAO_IDLType_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- delete this->proxy_cache_[i];
--
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Implementation
+ //
+@@ -7384,9 +7375,9 @@
+
}
-IR::_TAO_IDLType_Proxy_Impl&
--POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::select_proxy (
++_TAO_IDLType_Proxy_Impl&
+ POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::select_proxy (
- ::IR::IDLType *object,
-+CORBA::Boolean POA_IR::ComponentRepository::_is_a (
-+ const char* value,
++ IR_IDLType *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-- TAO_ORB_Core::collocation_strategy (object);
--
-- if (this->proxy_cache_[strategy] != 0)
-- return *this->proxy_cache_[strategy];
--
-- this->create_proxy (strategy, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
--
-- return *this->proxy_cache_[strategy];
--
-+ 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-+ return 1;
-+ else
-+ return 0;
- }
-
--void
--POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::create_proxy (
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-- CORBA::Environment &ACE_TRY_ENV
-+void* POA_IR::ComponentRepository::_downcast (
-+ const char* logical_type_id
- )
- {
-- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
--
-- if (this->proxy_cache_[strategy] == 0)
-- {
-- switch (strategy)
-- {
-- case TAO_ORB_Core::THRU_POA_STRATEGY:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
+@@ -7418,7 +7409,7 @@
+ case TAO_ORB_Core::THRU_POA_STRATEGY:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
- POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- case TAO_ORB_Core::REMOTE_STRATEGY:
-- default:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
++ _TAO_IDLType_ThruPOA_Proxy_Impl,
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -7428,7 +7419,7 @@
+ default:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
- ::IR::_TAO_IDLType_Remote_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- }
--
-- }
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ComponentRepository:1.0") == 0)
-+ return ACE_static_cast (POA_IR::ComponentRepository_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Repository:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Repository_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Container_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-+ return ACE_static_cast(PortableServer::Servant, this);
-+ return 0;
- }
++ _TAO_IDLType_Remote_Proxy_Impl,
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -7445,26 +7436,26 @@
+ ///////////////////////////////////////////////////////////////////////
-+void POA_IR::ComponentRepository::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+{
-+ this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
-+}
--//
--// End Strategized Proxy Broker Implementation
--///////////////////////////////////////////////////////////////////////
--
--
-IR::_TAO_IDLType_Proxy_Broker *
-IR__TAO_IDLType_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+const char* POA_IR::ComponentRepository::_interface_repository_id (void) const
++_TAO_IDLType_Proxy_Broker *
++_TAO_IDLType_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
-- ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::the_TAO_IDLType_Strategized_Proxy_Broker();
-+ return "IDL:omg.org/IR/ComponentRepository:1.0";
+ ACE_UNUSED_ARG (obj);
+ return ::POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::the_TAO_IDLType_Strategized_Proxy_Broker();
}
--int
+ int
-IR__TAO_IDLType_Proxy_Broker_Factory_Initializer (long _dummy_)
-+IR::ComponentRepository*
-+POA_IR::ComponentRepository::_this (CORBA_Environment &ACE_TRY_ENV)
++_TAO_IDLType_Proxy_Broker_Factory_Initializer (long _dummy_)
{
-- ACE_UNUSED_ARG (_dummy_);
-+ TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (0);
+ ACE_UNUSED_ARG (_dummy_);
- IR__TAO_IDLType_Proxy_Broker_Factory_function_pointer =
- IR__TAO_IDLType_Proxy_Broker_Factory_function;
-+ CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
-- return 0;
-+ if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-+ else
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-+
-+ CORBA::Object_var obj = tmp;
-+ return IR_ComponentRepository::_unchecked_narrow (obj.in ());
++ _TAO_IDLType_Proxy_Broker_Factory_function_pointer =
++ _TAO_IDLType_Proxy_Broker_Factory_function;
+
+ return 0;
}
-static int IR__TAO_IDLType_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- IR__TAO_IDLType_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_IDLType_Proxy_Broker_Factory_Initializer));
--
--
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Proxy Implementation
--//
-+class TAO_IR_ModuleDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+{
-+private:
-+ unsigned int hash (const char *str, unsigned int len);
-+public:
-+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-+};
-+/* starting time is 11:23:09 */
-+/* C++ code produced by gperf version 2.8 (ACE version) */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ModuleDef_Perfect_Hash_OpTable -N lookup */
-+unsigned int
-+TAO_IR_ModuleDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+{
-+ static const unsigned char asso_values[] =
-+ {
-+#if defined (ACE_MVS)
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 10,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 0,
-+ 52, 0, 15, 0, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 20, 0, 5,
-+ 52, 10, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 10, 20, 52, 52, 52, 10, 15, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52,
-+#else
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 10, 52, 0, 52, 0,
-+ 15, 0, 52, 52, 52, 52, 52, 52, 20, 0,
-+ 5, 52, 10, 52, 52, 10, 20, 52, 52, 52,
-+ 10, 15, 52, 52, 52, 52, 52, 52,
-+#endif /* ACE_MVS */
-+ };
-+ return len + asso_values[str[len - 1]] + asso_values[str[0]];
-+}
-
--POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl::_TAO_IDLType_ThruPOA_Proxy_Impl (void)
--{}
-+const class TAO_operation_db_entry *
-+TAO_IR_ModuleDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+{
-+ enum
-+ {
-+ TOTAL_KEYWORDS = 30,
-+ MIN_WORD_LENGTH = 4,
-+ MAX_WORD_LENGTH = 26,
-+ MIN_HASH_VALUE = 4,
-+ MAX_HASH_VALUE = 51,
-+ HASH_VALUE_RANGE = 48,
-+ DUPLICATES = 5
-+ };
-
--// ThruPOA Implementation of the IDL interface methods
-+ static const class TAO_operation_db_entry wordlist[] =
-+ {
-+ {"",0},{"",0},{"",0},{"",0},
-+ {"move", &POA_IR::ModuleDef::move_skel},
-+ {"create_enum", &POA_IR::ModuleDef::create_enum_skel},
-+ {"create_value", &POA_IR::ModuleDef::create_value_skel},
-+ {"create_module", &POA_IR::ModuleDef::create_module_skel},
-+ {"create_native", &POA_IR::ModuleDef::create_native_skel},
-+ {"_is_a", &POA_IR::ModuleDef::_is_a_skel},
-+ {"create_interface", &POA_IR::ModuleDef::create_interface_skel},
-+ {"create_union", &POA_IR::ModuleDef::create_union_skel},
-+ {"contents", &POA_IR::ModuleDef::contents_skel},
-+ {"_get_name", &POA_IR::ModuleDef::_get_name_skel},
-+ {"_set_name", &POA_IR::ModuleDef::_set_name_skel},
-+ {"create_exception", &POA_IR::ModuleDef::create_exception_skel},
-+ {"create_alias", &POA_IR::ModuleDef::create_alias_skel},
-+ {"describe", &POA_IR::ModuleDef::describe_skel},
-+ {"create_value_box", &POA_IR::ModuleDef::create_value_box_skel},
-+ {"_get_version", &POA_IR::ModuleDef::_get_version_skel},
-+ {"_set_version", &POA_IR::ModuleDef::_set_version_skel},
-+ {"_get_absolute_name", &POA_IR::ModuleDef::_get_absolute_name_skel},
-+ {"_get_defined_in", &POA_IR::ModuleDef::_get_defined_in_skel},
-+ {"lookup_name", &POA_IR::ModuleDef::lookup_name_skel},
-+ {"_get_id", &POA_IR::ModuleDef::_get_id_skel},
-+ {"_set_id", &POA_IR::ModuleDef::_set_id_skel},
-+ {"create_struct", &POA_IR::ModuleDef::create_struct_skel},
-+ {"create_constant", &POA_IR::ModuleDef::create_constant_skel},
-+ {"lookup", &POA_IR::ModuleDef::lookup_skel},
-+ {"destroy", &POA_IR::ModuleDef::destroy_skel},
-+ {"_get_def_kind", &POA_IR::ModuleDef::_get_def_kind_skel},
-+ {"describe_contents", &POA_IR::ModuleDef::describe_contents_skel},
-+ {"_non_existent", &POA_IR::ModuleDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::ModuleDef::_get_containing_repository_skel},
-+ };
-
--CORBA::TypeCode_ptr POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl::type (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- CORBA::TypeCode_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "type",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::IDLType_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/IDLType:1.0"
-- )
-- )->type (
-- ACE_TRY_ENV
-- );
-+ static const signed char lookup[] =
-+ {
-+ -1, -1, -1, -1, 4, -7, -2, -13, -2, -19, -2, 5, 6, -59,
-+ -1, 9, 10, 11, 12, -63, -1, 15, 16, 17, -24, -2, 18, -69,
-+ 21, -1, 22, 23, -59, 26, -1, 27, 28, 29, 30, -1, -1, -1,
-+ 31, 32, -1, -1, -1, -1, -1, -1, -1, 33,
-+ };
-+
-+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-+ {
-+ unsigned int key = hash (str, len);
-+
-+ if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-+ {
-+ int slot = lookup[key];
-+
-+ if (slot >= 0 && slot < MAX_HASH_VALUE)
-+ {
-+ const char *s = wordlist[slot].opname_;
-+
-+ if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-+ return &wordlist[slot];
-+ }
-+ else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-+ return 0;
-+ else
-+ {
-+ unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-+ const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-+ const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
-+
-+ while (--ptr >= base)
-+ if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-+ return ptr;
-+ }
-+ }
-+ }
-+ return 0;
- }
-+/* ending time is 11:23:09 */
-+static TAO_IR_ModuleDef_Perfect_Hash_OpTable tao_IR_ModuleDef_optable;
++static int _TAO_IDLType_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
++ _TAO_IDLType_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_IDLType_Proxy_Broker_Factory_Initializer));
--//
--// End ThruPOA Proxy Implementation
- ///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Implementation
-+//
--// skeleton constructor
--POA_IR::IDLType::IDLType (void)
-+// Factory function Implementation.
-+POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker *POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::the_TAO_ModuleDef_Strategized_Proxy_Broker (void)
- {
-- this->optable_ = &tao_IR_IDLType_optable;
-+ static POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ return &strategized_proxy_broker;
- }
+ ///////////////////////////////////////////////////////////////////////
+@@ -7519,7 +7510,7 @@
--// copy ctor
--POA_IR::IDLType::IDLType (const IDLType& rhs)
+ // copy ctor
+ POA_IR::IDLType::IDLType (const IDLType& rhs)
- : ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-- TAO_ServantBase (rhs)
--{}
--
--// skeleton destructor
--POA_IR::IDLType::~IDLType (void)
-+POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::_TAO_ModuleDef_Strategized_Proxy_Broker (void)
- {
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ this->proxy_cache_[i] = 0;
-+
- }
-
--void POA_IR::IDLType::_get_type_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-+POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::~_TAO_ModuleDef_Strategized_Proxy_Broker (void)
- {
-- POA_IR::IDLType *_tao_impl = (POA_IR::IDLType *)_tao_object_reference;
--
-- CORBA::TypeCode_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->type (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ delete this->proxy_cache_[i];
-
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
- }
++ : POA_CORBA_IRObject (rhs),
+ TAO_ServantBase (rhs)
+ {}
--void POA_IR::IDLType::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-+_TAO_ModuleDef_Proxy_Impl&
-+POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::select_proxy (
-+ IR_ModuleDef *object,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::IDLType *_tao_impl = (POA_IR::IDLType *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = 0;
-- CORBA::String_var value;
+@@ -7619,7 +7610,7 @@
+ POA_IR::IDLType *_tao_impl = (POA_IR::IDLType *) _tao_object_reference;
+ CORBA::Boolean _tao_retval = 0;
+ CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
-- ACE_THROW (CORBA::MARSHAL ());
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-+ TAO_ORB_Core::collocation_strategy (object);
-
-- _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-- ACE_CHECK;
-+ if (this->proxy_cache_[strategy] != 0)
-+ return *this->proxy_cache_[strategy];
-+
-+ this->create_proxy (strategy, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-+
-+ return *this->proxy_cache_[strategy];
-
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
++ if (!((_tao_in >> value.out ())))
+ ACE_THROW (CORBA::MARSHAL ());
+
+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+@@ -7627,7 +7618,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
++ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
+ ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::IDLType::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-+void
-+POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::create_proxy (
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::IDLType *_tao_impl = (POA_IR::IDLType *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-- ACE_CHECK;
-+ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
+@@ -7644,7 +7635,7 @@
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
-+ if (this->proxy_cache_[strategy] == 0)
-+ {
-+ switch (strategy)
-+ {
-+ case TAO_ORB_Core::THRU_POA_STRATEGY:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
-+ _TAO_ModuleDef_ThruPOA_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ case TAO_ORB_Core::REMOTE_STRATEGY:
-+ default:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
-+ _TAO_ModuleDef_Remote_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ }
-+
-+ }
- }
-
--CORBA::Boolean POA_IR::IDLType::_is_a (
-- const char* value,
-+
-+//
-+// End Strategized Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-+
-+_TAO_ModuleDef_Proxy_Broker *
-+_TAO_ModuleDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+{
-+ ACE_UNUSED_ARG (obj);
-+ return ::POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::the_TAO_ModuleDef_Strategized_Proxy_Broker();
-+}
-+
-+int
-+_TAO_ModuleDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+{
-+ ACE_UNUSED_ARG (_dummy_);
-+
-+ _TAO_ModuleDef_Proxy_Broker_Factory_function_pointer =
-+ _TAO_ModuleDef_Proxy_Broker_Factory_function;
-+
-+ return 0;
-+}
-+
-+static int _TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-+ _TAO_ModuleDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ModuleDef_Proxy_Broker_Factory_Initializer));
-+
-+
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Proxy Implementation
-+//
-+
-+POA_IR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_TAO_ModuleDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::~_TAO_ModuleDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+// ThruPOA Implementation of the IDL interface methods
-+
-+//
-+// End ThruPOA Proxy Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-+// skeleton constructor
-+POA_IR::ModuleDef::ModuleDef (void)
-+{
-+ this->optable_ = &tao_IR_ModuleDef_optable;
-+}
-+
-+// copy ctor
-+POA_IR::ModuleDef::ModuleDef (const ModuleDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-+ POA_CORBA_IRObject (rhs),
-+ TAO_ServantBase (rhs)
-+{}
-+
-+// skeleton destructor
-+POA_IR::ModuleDef::~ModuleDef (void)
-+{
-+}
-+
-+void POA_IR::ModuleDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+{
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ModuleDef *_tao_impl = (POA_IR::ModuleDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = 0;
-+ CORBA::String_var value;
-+ if (!((_tao_in >> value.out ())))
-+ ACE_THROW (CORBA::MARSHAL ());
-+
-+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
-+}
-+
-+void POA_IR::ModuleDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+{
-+ POA_IR::ModuleDef *_tao_impl = (POA_IR::ModuleDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
-+}
-+
-+CORBA::Boolean POA_IR::ModuleDef::_is_a (
-+ const 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/IR/ModuleDef: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/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
- return 1;
-@@ -7663,31 +5310,35 @@
- return 0;
+ ACE_THROW (CORBA::MARSHAL ());
}
--void* POA_IR::IDLType::_downcast (
-+void* POA_IR::ModuleDef::_downcast (
- const char* logical_type_id
- )
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-- return ACE_static_cast (POA_IR::IDLType_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ModuleDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::ModuleDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Container_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Contained_ptr, this);
+@@ -7669,7 +7660,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
+ return ACE_static_cast (POA_IR::IDLType_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
- }
-
--void POA_IR::IDLType::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::ModuleDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--const char* POA_IR::IDLType::_interface_repository_id (void) const
-+const char* POA_IR::ModuleDef::_interface_repository_id (void) const
- {
-- return "IDL:omg.org/IR/IDLType:1.0";
-+ return "IDL:omg.org/IR/ModuleDef:1.0";
- }
-
--IR::IDLType*
--POA_IR::IDLType::_this (CORBA_Environment &ACE_TRY_ENV)
-+IR::ModuleDef*
-+POA_IR::ModuleDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-@@ -7700,203 +5351,114 @@
+@@ -7699,10 +7690,9 @@
ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
CORBA::Object_var obj = tmp;
- return ::IR::IDLType::_unchecked_narrow (obj.in ());
--}
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::TAO_ServerRequestInfo_IR_IDLType_type_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::IDLType *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
++ return IR_IDLType::_unchecked_narrow (obj.in ());
+ }
+
-
--void
--POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::result (CORBA::TypeCode_ptr result)
--{
-- // Update the result.
-- this->_result = result;
-+ return IR_ModuleDef::_unchecked_narrow (obj.in ());
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::TAO_ServerRequestInfo_IR_IDLType_type_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -7780,6 +7770,7 @@
}
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_Repository_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+class TAO_IR_ConstantDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_Repository_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
private:
- unsigned int hash (const char *str, unsigned int len);
+@@ -7787,7 +7778,7 @@
public:
const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
};
--/* starting time is 16:31:12 */
+-/* starting time is 18:47:27 */
+/* starting time is 11:23:09 */
/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_Repository_Perfect_Hash_OpTable -N lookup */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ConstantDef_Perfect_Hash_OpTable -N lookup */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_Repository_Perfect_Hash_OpTable -N lookup */
unsigned int
--TAO_IR_Repository_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+TAO_IR_ConstantDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
- static const unsigned char asso_values[] =
- {
- #if defined (ACE_MVS)
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 20,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 15,
-- 71, 0, 23, 10, 71, 5, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 0, 0, 15,
-- 71, 0, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 30, 0, 71, 71, 71, 0, 0, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 0, 0, 10, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 15, 37, 37, 37, 37, 10, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37,
- #else
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
-- 71, 71, 71, 71, 71, 20, 71, 15, 71, 0,
-- 23, 10, 71, 5, 71, 71, 71, 71, 0, 0,
-- 15, 71, 0, 71, 71, 30, 0, 71, 71, 71,
-- 0, 0, 71, 71, 71, 71, 71, 71,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-+ 0, 0, 10, 37, 37, 37, 37, 37, 37, 0,
-+ 0, 37, 37, 37, 37, 37, 15, 37, 37, 37,
-+ 37, 10, 37, 37, 37, 37, 37, 37,
- #endif /* ACE_MVS */
- };
- return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
- const class TAO_operation_db_entry *
--TAO_IR_Repository_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+TAO_IR_ConstantDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
- enum
- {
-- TOTAL_KEYWORDS = 27,
-- MIN_WORD_LENGTH = 5,
-- MAX_WORD_LENGTH = 22,
-- MIN_HASH_VALUE = 6,
-- MAX_HASH_VALUE = 70,
-- HASH_VALUE_RANGE = 65,
-- DUPLICATES = 2
-+ TOTAL_KEYWORDS = 20,
-+ MIN_WORD_LENGTH = 4,
-+ MAX_WORD_LENGTH = 26,
-+ MIN_HASH_VALUE = 4,
-+ MAX_HASH_VALUE = 36,
-+ HASH_VALUE_RANGE = 33,
-+ DUPLICATES = 7
- };
-
- static const class TAO_operation_db_entry wordlist[] =
- {
-- {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
-- {"lookup", &POA_IR::Repository::lookup_skel},
-- {"create_enum", &POA_IR::Repository::create_enum_skel},
-- {"create_array", &POA_IR::Repository::create_array_skel},
-- {"create_struct", &POA_IR::Repository::create_struct_skel},
-- {"create_constant", &POA_IR::Repository::create_constant_skel},
-- {"create_value_box", &POA_IR::Repository::create_value_box_skel},
-- {"create_string", &POA_IR::Repository::create_string_skel},
-- {"create_wstring", &POA_IR::Repository::create_wstring_skel},
-- {"lookup_name", &POA_IR::Repository::lookup_name_skel},
-- {"create_value", &POA_IR::Repository::create_value_skel},
-- {"create_module", &POA_IR::Repository::create_module_skel},
-- {"create_native", &POA_IR::Repository::create_native_skel},
-- {"create_sequence", &POA_IR::Repository::create_sequence_skel},
-- {"create_interface", &POA_IR::Repository::create_interface_skel},
-- {"create_union", &POA_IR::Repository::create_union_skel},
-- {"get_primitive", &POA_IR::Repository::get_primitive_skel},
-- {"destroy", &POA_IR::Repository::destroy_skel},
-- {"create_exception", &POA_IR::Repository::create_exception_skel},
-- {"lookup_id", &POA_IR::Repository::lookup_id_skel},
-- {"_non_existent", &POA_IR::Repository::_non_existent_skel},
-- {"create_fixed", &POA_IR::Repository::create_fixed_skel},
-- {"get_canonical_typecode", &POA_IR::Repository::get_canonical_typecode_skel},
-- {"contents", &POA_IR::Repository::contents_skel},
-- {"_is_a", &POA_IR::Repository::_is_a_skel},
-- {"create_alias", &POA_IR::Repository::create_alias_skel},
-- {"_get_def_kind", &POA_IR::Repository::_get_def_kind_skel},
-- {"describe_contents", &POA_IR::Repository::describe_contents_skel},
-+ {"",0},{"",0},{"",0},{"",0},
-+ {"move", &POA_IR::ConstantDef::move_skel},
-+ {"_is_a", &POA_IR::ConstantDef::_is_a_skel},
-+ {"_get_id", &POA_IR::ConstantDef::_get_id_skel},
-+ {"_set_id", &POA_IR::ConstantDef::_set_id_skel},
-+ {"describe", &POA_IR::ConstantDef::describe_skel},
-+ {"_get_type", &POA_IR::ConstantDef::_get_type_skel},
-+ {"_set_name", &POA_IR::ConstantDef::_set_name_skel},
-+ {"_get_name", &POA_IR::ConstantDef::_get_name_skel},
-+ {"_get_value", &POA_IR::ConstantDef::_get_value_skel},
-+ {"_set_value", &POA_IR::ConstantDef::_set_value_skel},
-+ {"_get_version", &POA_IR::ConstantDef::_get_version_skel},
-+ {"_set_version", &POA_IR::ConstantDef::_set_version_skel},
-+ {"_get_def_kind", &POA_IR::ConstantDef::_get_def_kind_skel},
-+ {"_get_defined_in", &POA_IR::ConstantDef::_get_defined_in_skel},
-+ {"destroy", &POA_IR::ConstantDef::destroy_skel},
-+ {"_get_absolute_name", &POA_IR::ConstantDef::_get_absolute_name_skel},
-+ {"_get_type_def", &POA_IR::ConstantDef::_get_type_def_skel},
-+ {"_set_type_def", &POA_IR::ConstantDef::_set_type_def_skel},
-+ {"_non_existent", &POA_IR::ConstantDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::ConstantDef::_get_containing_repository_skel},
- };
-
- static const signed char lookup[] =
- {
-- -1, -1, -1, -1, -1, -1, 6, -1, -1, -16, -2, 7, 8, 9,
-- -1, 10, 11, -1, 12, 13, -1, 14, 15, -84, -1, 18, 19, 20,
-- 21, -1, 22, 23, 24, 25, -1, 26, -1, 27, 28, -1, 29, -1,
-- 30, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-- 31, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-- 32,
-+ -12, -2, -14, -2, 4, 5, -1, 53, 8, 46, -46, -1, -46, 16,
-+ -1, 17, -1, 18, 19, -9, -3, -20, -2, -38, -6, -2, -1, -1,
-+ 22, -1, -1, -1, -1, -1, -1, -1, 23,
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -7930,38 +5492,37 @@
+@@ -7928,10 +7919,9 @@
}
return 0;
}
--/* ending time is 16:31:12 */
--static TAO_IR_Repository_Perfect_Hash_OpTable tao_IR_Repository_optable;
--
+-/* ending time is 18:47:27 */
+/* ending time is 11:23:09 */
-+static TAO_IR_ConstantDef_Perfect_Hash_OpTable tao_IR_ConstantDef_optable;
+ static TAO_IR_Repository_Perfect_Hash_OpTable tao_IR_Repository_optable;
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Implementation
//
-
- // Factory function Implementation.
--POA_IR::_TAO_Repository_Strategized_Proxy_Broker *POA_IR::_TAO_Repository_Strategized_Proxy_Broker::the_TAO_Repository_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker *POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::the_TAO_ConstantDef_Strategized_Proxy_Broker (void)
- {
-- static POA_IR::_TAO_Repository_Strategized_Proxy_Broker strategized_proxy_broker;
-+ static POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker strategized_proxy_broker;
- return &strategized_proxy_broker;
- }
-
--POA_IR::_TAO_Repository_Strategized_Proxy_Broker::_TAO_Repository_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::_TAO_ConstantDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- this->proxy_cache_[i] = 0;
-
- }
-
--POA_IR::_TAO_Repository_Strategized_Proxy_Broker::~_TAO_Repository_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::~_TAO_ConstantDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- delete this->proxy_cache_[i];
+@@ -7957,9 +7947,9 @@
}
-IR::_TAO_Repository_Proxy_Impl&
--POA_IR::_TAO_Repository_Strategized_Proxy_Broker::select_proxy (
++_TAO_Repository_Proxy_Impl&
+ POA_IR::_TAO_Repository_Strategized_Proxy_Broker::select_proxy (
- ::IR::Repository *object,
-+_TAO_ConstantDef_Proxy_Impl&
-+POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::select_proxy (
-+ IR_ConstantDef *object,
++ IR_Repository *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -7979,7 +5540,7 @@
- }
-
- void
--POA_IR::_TAO_Repository_Strategized_Proxy_Broker::create_proxy (
-+POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::create_proxy (
- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -7993,7 +5554,7 @@
+@@ -7991,7 +7981,7 @@
case TAO_ORB_Core::THRU_POA_STRATEGY:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
- POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl,
-+ _TAO_ConstantDef_ThruPOA_Proxy_Impl,
++ _TAO_Repository_ThruPOA_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -8003,7 +5564,7 @@
+@@ -8001,7 +7991,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
- ::IR::_TAO_Repository_Remote_Proxy_Impl,
-+ _TAO_ConstantDef_Remote_Proxy_Impl,
++ _TAO_Repository_Remote_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -8020,73 +5581,42 @@
+@@ -8018,26 +8008,26 @@
///////////////////////////////////////////////////////////////////////
-IR::_TAO_Repository_Proxy_Broker *
-IR__TAO_Repository_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_ConstantDef_Proxy_Broker *
-+_TAO_ConstantDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
++_TAO_Repository_Proxy_Broker *
++_TAO_Repository_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_Repository_Strategized_Proxy_Broker::the_TAO_Repository_Strategized_Proxy_Broker();
-+ return ::POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::the_TAO_ConstantDef_Strategized_Proxy_Broker();
+ return ::POA_IR::_TAO_Repository_Strategized_Proxy_Broker::the_TAO_Repository_Strategized_Proxy_Broker();
}
int
-IR__TAO_Repository_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_ConstantDef_Proxy_Broker_Factory_Initializer (long _dummy_)
++_TAO_Repository_Proxy_Broker_Factory_Initializer (long _dummy_)
{
ACE_UNUSED_ARG (_dummy_);
- IR__TAO_Repository_Proxy_Broker_Factory_function_pointer =
- IR__TAO_Repository_Proxy_Broker_Factory_function;
-+ _TAO_ConstantDef_Proxy_Broker_Factory_function_pointer =
-+ _TAO_ConstantDef_Proxy_Broker_Factory_function;
++ _TAO_Repository_Proxy_Broker_Factory_function_pointer =
++ _TAO_Repository_Proxy_Broker_Factory_function;
return 0;
}
-static int IR__TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- IR__TAO_Repository_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_Repository_Proxy_Broker_Factory_Initializer));
-+static int _TAO_ConstantDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-+ _TAO_ConstantDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ConstantDef_Proxy_Broker_Factory_Initializer));
++static int _TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
++ _TAO_Repository_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_Repository_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
- // ThruPOA Proxy Implementation
- //
-
--POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::_TAO_Repository_ThruPOA_Proxy_Impl (void)
-+POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_TAO_ConstantDef_ThruPOA_Proxy_Impl (void)
- {}
-
--// ThruPOA Implementation of the IDL interface methods
-+POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::~_TAO_ConstantDef_ThruPOA_Proxy_Impl (void)
-+{}
-
--IR::Contained_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::lookup_id (
-- CORBA_Object *_collocated_tao_target_,
-- const char * search_id,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
+@@ -8058,7 +8048,7 @@
+ CORBA::SystemException
+ ))
+ {
- IR::Contained_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "lookup_id",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::Repository_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Repository:1.0"
-- )
-- )->lookup_id (
-- search_id,
-- ACE_TRY_ENV
-- );
--}
-+// ThruPOA Implementation of the IDL interface methods
++ IR_Contained_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -8115,16 +8105,16 @@
+ );
+ }
--CORBA::TypeCode_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::get_canonical_typecode (
-+CORBA::TypeCode_ptr POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type (
+-IR::PrimitiveDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::get_primitive (
++IR_PrimitiveDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::get_primitive (
CORBA_Object *_collocated_tao_target_,
-- CORBA::TypeCode_ptr tc,
+- IR::PrimitiveKind kind,
++ IR_PrimitiveKind kind,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -8101,98 +5631,30 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "get_canonical_typecode",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::Repository_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Repository:1.0"
-- )
-- )->get_canonical_typecode (
-- tc,
-- ACE_TRY_ENV
-- );
--}
--
--IR::PrimitiveDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::get_primitive (
-- CORBA_Object *_collocated_tao_target_,
-- IR::PrimitiveKind kind,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
+ CORBA::SystemException
+ ))
+ {
- IR::PrimitiveDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "get_primitive",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::Repository_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Repository:1.0"
-- )
-- )->get_primitive (
-- kind,
-- ACE_TRY_ENV
-- );
--}
--
++ IR_PrimitiveDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -8148,7 +8138,7 @@
+ );
+ }
+
-IR::StringDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_string (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
++IR_StringDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_string (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -8157,7 +8147,7 @@
+ CORBA::SystemException
+ ))
+ {
- IR::StringDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_string",
-+ "type",
- forward_to.out (),
- ACE_TRY_ENV
- );
- ACE_CHECK_RETURN (0);
- return ACE_reinterpret_cast (
-- POA_IR::Repository_ptr,
-+ POA_IR::ConstantDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Repository:1.0"
-+ "IDL:omg.org/IR/ConstantDef:1.0"
- )
-- )->create_string (
-- bound,
-+ )->type (
- ACE_TRY_ENV
++ IR_StringDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -8181,7 +8171,7 @@
);
}
-IR::WstringDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_wstring (
-+IR::IDLType_ptr POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type_def (
++IR_WstringDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_wstring (
CORBA_Object *_collocated_tao_target_,
-- CORBA::ULong bound,
+ CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
+@@ -8190,7 +8180,7 @@
CORBA::SystemException
))
{
- IR::WstringDef_var _tao_retval;
-+ IR_IDLType_var _tao_retval;
++ IR_WstringDef_var _tao_retval;
ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -8200,68 +5662,62 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "create_wstring",
-+ "type_def",
- forward_to.out (),
- ACE_TRY_ENV
- );
- ACE_CHECK_RETURN (0);
- return ACE_reinterpret_cast (
-- POA_IR::Repository_ptr,
-+ POA_IR::ConstantDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Repository:1.0"
-+ "IDL:omg.org/IR/ConstantDef:1.0"
- )
-- )->create_wstring (
-- bound,
-+ )->type_def (
- ACE_TRY_ENV
+@@ -8214,17 +8204,17 @@
);
}
-IR::SequenceDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_sequence (
-+void POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type_def (
++IR_SequenceDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_sequence (
CORBA_Object *_collocated_tao_target_,
-- CORBA::ULong bound,
+ CORBA::ULong bound,
- IR::IDLType_ptr element_type,
-+ IR_IDLType_ptr type_def,
++ IR_IDLType_ptr element_type,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
@@ -11015,43 +2181,20 @@
))
{
- IR::SequenceDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
++ IR_SequenceDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "create_sequence",
-+ "type_def",
- forward_to.out (),
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::Repository_ptr,
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::ConstantDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Repository:1.0"
-+ "IDL:omg.org/IR/ConstantDef:1.0"
- )
-- )->create_sequence (
-- bound,
-- element_type,
-+ )->type_def (
-+ type_def,
- ACE_TRY_ENV
+@@ -8249,17 +8239,17 @@
);
-+ return;
}
-IR::ArrayDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_array (
-+CORBA::Any * POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::value (
++IR_ArrayDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_array (
CORBA_Object *_collocated_tao_target_,
-- CORBA::ULong length,
+ CORBA::ULong length,
- IR::IDLType_ptr element_type,
++ IR_IDLType_ptr element_type,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
@@ -11059,911 +2202,239 @@
))
{
- IR::ArrayDef_var _tao_retval;
-+ CORBA::Any_var _tao_retval;
++ IR_ArrayDef_var _tao_retval;
ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -8269,56 +5725,51 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "create_array",
-+ "value",
- forward_to.out (),
- ACE_TRY_ENV
- );
- ACE_CHECK_RETURN (0);
- return ACE_reinterpret_cast (
-- POA_IR::Repository_ptr,
-+ POA_IR::ConstantDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Repository:1.0"
-+ "IDL:omg.org/IR/ConstantDef:1.0"
- )
-- )->create_array (
-- length,
-- element_type,
-+ )->value (
- ACE_TRY_ENV
+@@ -8284,7 +8274,7 @@
);
}
-IR::FixedDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_fixed (
-+void POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::value (
++IR_FixedDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_fixed (
CORBA_Object *_collocated_tao_target_,
-- CORBA::UShort digits,
-- CORBA::Short scale,
-+ const CORBA::Any & value,
- CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
+ CORBA::UShort digits,
+ CORBA::Short scale,
+@@ -8294,7 +8284,7 @@
CORBA::SystemException
))
{
- IR::FixedDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
++ IR_FixedDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "create_fixed",
-+ "value",
- forward_to.out (),
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::Repository_ptr,
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::ConstantDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/Repository:1.0"
-+ "IDL:omg.org/IR/ConstantDef:1.0"
- )
-- )->create_fixed (
-- digits,
-- scale,
-+ )->value (
-+ value,
- ACE_TRY_ENV
- );
-+ return;
- }
-
- //
-@@ -8326,787 +5777,198 @@
- ///////////////////////////////////////////////////////////////////////
-
- // skeleton constructor
--POA_IR::Repository::Repository (void)
-+POA_IR::ConstantDef::ConstantDef (void)
- {
-- this->optable_ = &tao_IR_Repository_optable;
-+ this->optable_ = &tao_IR_ConstantDef_optable;
- }
-
+@@ -8332,7 +8322,7 @@
// copy ctor
--POA_IR::Repository::Repository (const Repository& rhs)
-- : ACE_NESTED_CLASS (POA_IR,Container) (rhs),
+ POA_IR::Repository::Repository (const Repository& rhs)
+ : ACE_NESTED_CLASS (POA_IR,Container) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+POA_IR::ConstantDef::ConstantDef (const ConstantDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ POA_CORBA_IRObject (rhs),
TAO_ServantBase (rhs)
{}
- // skeleton destructor
--POA_IR::Repository::~Repository (void)
-+POA_IR::ConstantDef::~ConstantDef (void)
- {
- }
-
--void POA_IR::Repository::lookup_id_skel (
-+void POA_IR::ConstantDef::_get_type_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
-+ POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *)_tao_object_reference;
-
-- IR::Contained_var _tao_retval;
-- CORBA::String_var search_id;
-+ CORBA::TypeCode_var _tao_retval;
-+
-+ _tao_retval = _tao_impl->type (
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+@@ -8351,14 +8341,13 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
+
+- IR::Contained_var _tao_retval;
++ IR_Contained_var _tao_retval;
+ CORBA::String_var search_id;
if (!(
-- (_tao_in >> search_id.out ())
-+ (_tao_out << _tao_retval.in ())
+ (_tao_in >> search_id.out ())
))
-- ACE_THROW (CORBA::MARSHAL());
-+ ACE_THROW (CORBA::MARSHAL () );
-+}
-+
-+void POA_IR::ConstantDef::_get_type_def_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *)_tao_object_reference;
-
-+ IR_IDLType_var _tao_retval;
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -8386,7 +8375,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::Contained_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_Contained_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -8447,7 +8436,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- search_id.in (),
-+ _tao_retval = _tao_impl->type_def (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
-
-- _tao_impl->lookup_id (
-- search_id.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::Contained_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -8529,14 +8517,13 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
+
+- IR::PrimitiveDef_var _tao_retval;
+- IR::PrimitiveKind kind;
++ IR_PrimitiveDef_var _tao_retval;
++ IR_PrimitiveKind kind;
if (!(
- (_tao_out << _tao_retval.in ())
+ (_tao_in >> kind)
))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void POA_IR::Repository::get_canonical_typecode_skel (
-+void POA_IR::ConstantDef::_set_type_def_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -8564,7 +8551,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::PrimitiveDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_PrimitiveDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -8618,14 +8605,13 @@
TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
-+ POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *)_tao_object_reference;
-
-- CORBA::TypeCode_var _tao_retval;
-- CORBA::TypeCode_var tc;
-+ IR_IDLType_var type_def;
+ POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
+
+- IR::StringDef_var _tao_retval;
++ IR_StringDef_var _tao_retval;
+ CORBA::ULong bound;
if (!(
-- (_tao_in >> tc.out ())
-+ (_tao_in >> type_def.out ())
+ (_tao_in >> bound)
))
-- ACE_THROW (CORBA::MARSHAL());
-+ ACE_THROW (CORBA::MARSHAL () );
-
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- tc.in (),
-+ _tao_impl->type_def (
-+ type_def.in (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->get_canonical_typecode (
-- tc.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::Repository::get_primitive_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
--
-- IR::PrimitiveDef_var _tao_retval;
-- IR::PrimitiveKind kind;
-- if (!(
-- (_tao_in >> kind)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- kind,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->get_primitive (
-- kind,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::PrimitiveDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-
-+ _tao_server_request.init_reply ();
- }
-
--void POA_IR::Repository::create_string_skel (
-+void POA_IR::ConstantDef::_get_value_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
--
-- IR::StringDef_var _tao_retval;
-- CORBA::ULong bound;
-- if (!(
-- (_tao_in >> bound)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+ POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *)_tao_object_reference;
-
-+ CORBA::Any_var _tao_retval;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- bound,
-+ _tao_retval = _tao_impl->value (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_string (
-- bound,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::StringDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::Repository::create_wstring_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
--
-- IR::WstringDef_var _tao_retval;
-- CORBA::ULong bound;
-- if (!(
-- (_tao_in >> bound)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- bound,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_wstring (
-- bound,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::WstringDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::Repository::create_sequence_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
--
-- IR::SequenceDef_var _tao_retval;
-- CORBA::ULong bound;
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -8653,7 +8639,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::StringDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_StringDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -8707,14 +8693,13 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
+
+- IR::WstringDef_var _tao_retval;
++ IR_WstringDef_var _tao_retval;
+ CORBA::ULong bound;
+ if (!(
+ (_tao_in >> bound)
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -8742,7 +8727,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::WstringDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_WstringDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -8796,16 +8781,15 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
+
+- IR::SequenceDef_var _tao_retval;
++ IR_SequenceDef_var _tao_retval;
+ CORBA::ULong bound;
- IR::IDLType_var element_type;
-- if (!(
-- (_tao_in >> bound) &&
-- (_tao_in >> element_type.out ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- bound,
-- element_type.in (),
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_sequence (
-- bound,
-- element_type.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::SequenceDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
++ IR_IDLType_var element_type;
if (!(
- (_tao_out << _tao_retval.in ())
+ (_tao_in >> bound) &&
+ (_tao_in >> element_type.out ())
))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void POA_IR::Repository::create_array_skel (
-+void POA_IR::ConstantDef::_set_value_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -8835,7 +8819,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::SequenceDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_SequenceDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -8889,16 +8873,15 @@
TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
-+ POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *)_tao_object_reference;
-
-- IR::ArrayDef_var _tao_retval;
-- CORBA::ULong length;
+ POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
+
+- IR::ArrayDef_var _tao_retval;
++ IR_ArrayDef_var _tao_retval;
+ CORBA::ULong length;
- IR::IDLType_var element_type;
-+ CORBA::Any value;
++ IR_IDLType_var element_type;
if (!(
-- (_tao_in >> length) &&
-- (_tao_in >> element_type.out ())
-+ (_tao_in >> value)
+ (_tao_in >> length) &&
+ (_tao_in >> element_type.out ())
))
-- ACE_THROW (CORBA::MARSHAL());
-+ ACE_THROW (CORBA::MARSHAL () );
-
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- length,
-- element_type.in (),
-+ _tao_impl->value (
-+ value,
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_array (
-- length,
-- element_type.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ArrayDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::Repository::create_fixed_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
--
-- IR::FixedDef_var _tao_retval;
-- CORBA::UShort digits;
-- CORBA::Short scale;
-- if (!(
-- (_tao_in >> digits) &&
-- (_tao_in >> scale)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- digits,
-- scale,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_fixed (
-- digits,
-- scale,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::FixedDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-
-+ _tao_server_request.init_reply ();
- }
-
--void POA_IR::Repository::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::ConstantDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -8928,7 +8911,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ArrayDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_ArrayDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -8982,7 +8965,7 @@
TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::Repository *_tao_impl = (POA_IR::Repository *) _tao_object_reference;
-+ POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *) _tao_object_reference;
+ POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
+
+- IR::FixedDef_var _tao_retval;
++ IR_FixedDef_var _tao_retval;
+ CORBA::UShort digits;
+ CORBA::Short scale;
+ if (!(
+@@ -8991,7 +8974,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -9021,7 +9003,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::FixedDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_FixedDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -9076,7 +9058,7 @@
+ POA_IR::Repository *_tao_impl = (POA_IR::Repository *) _tao_object_reference;
CORBA::Boolean _tao_retval = 0;
CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
ACE_THROW (CORBA::MARSHAL ());
--
-+
+
_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -9084,7 +9066,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -11971,21 +2442,8 @@
ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::Repository::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::ConstantDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::Repository *_tao_impl = (POA_IR::Repository *) _tao_object_reference;
-+ POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *) _tao_object_reference;
- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -9101,7 +9083,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -11993,1411 +2451,161 @@
ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Boolean POA_IR::Repository::_is_a (
-+CORBA::Boolean POA_IR::ConstantDef::_is_a (
- const 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/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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
- return 1;
-@@ -9114,33 +5976,33 @@
- return 0;
- }
-
--void* POA_IR::Repository::_downcast (
-+void* POA_IR::ConstantDef::_downcast (
- const char* logical_type_id
- )
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Repository:1.0") == 0)
-- return ACE_static_cast (POA_IR::Repository_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-- return ACE_static_cast (POA_IR::Container_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ConstantDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::ConstantDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Contained_ptr, this);
+@@ -9129,7 +9111,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
+ return ACE_static_cast (POA_IR::Container_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
- }
-
--void POA_IR::Repository::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::ConstantDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--const char* POA_IR::Repository::_interface_repository_id (void) const
-+const char* POA_IR::ConstantDef::_interface_repository_id (void) const
- {
-- return "IDL:omg.org/IR/Repository:1.0";
-+ return "IDL:omg.org/IR/ConstantDef:1.0";
- }
-
--IR::Repository*
--POA_IR::Repository::_this (CORBA_Environment &ACE_TRY_ENV)
-+IR::ConstantDef*
-+POA_IR::ConstantDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-@@ -9153,831 +6015,508 @@
+@@ -9159,10 +9141,9 @@
ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
CORBA::Object_var obj = tmp;
- return ::IR::Repository::_unchecked_narrow (obj.in ());
-+ return IR_ConstantDef::_unchecked_narrow (obj.in ());
- }
-
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::TAO_ServerRequestInfo_IR_Repository_lookup_id (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Repository *tao_impl
-- ,
-- const char * search_id,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- search_id_ (search_id)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+class TAO_IR_TypedefDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_search_id = parameter_list->length ();
-- parameter_list->length (length_search_id + 1);
-- (*parameter_list)[length_search_id].argument <<= search_id_;
-- (*parameter_list)[length_search_id].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+private:
-+ unsigned int hash (const char *str, unsigned int len);
-+public:
-+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-+};
-+/* starting time is 11:23:09 */
-+/* C++ code produced by gperf version 2.8 (ACE version) */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_TypedefDef_Perfect_Hash_OpTable -N lookup */
-+unsigned int
-+TAO_IR_TypedefDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ static const unsigned char asso_values[] =
-+ {
-+#if defined (ACE_MVS)
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 0, 0, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37,
-+#else
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-+ 0, 0, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
-+ 37, 10, 37, 37, 37, 37, 37, 37,
-+#endif /* ACE_MVS */
-+ };
-+ return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
--CORBA::Any *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+const class TAO_operation_db_entry *
-+TAO_IR_TypedefDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+ enum
-+ {
-+ TOTAL_KEYWORDS = 16,
-+ MIN_WORD_LENGTH = 4,
-+ MAX_WORD_LENGTH = 26,
-+ MIN_HASH_VALUE = 4,
-+ MAX_HASH_VALUE = 36,
-+ HASH_VALUE_RANGE = 33,
-+ DUPLICATES = 5
-+ };
-
--char *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ static const class TAO_operation_db_entry wordlist[] =
-+ {
-+ {"",0},{"",0},{"",0},{"",0},
-+ {"move", &POA_IR::TypedefDef::move_skel},
-+ {"_is_a", &POA_IR::TypedefDef::_is_a_skel},
-+ {"_get_id", &POA_IR::TypedefDef::_get_id_skel},
-+ {"_set_id", &POA_IR::TypedefDef::_set_id_skel},
-+ {"describe", &POA_IR::TypedefDef::describe_skel},
-+ {"_get_name", &POA_IR::TypedefDef::_get_name_skel},
-+ {"_get_type", &POA_IR::TypedefDef::_get_type_skel},
-+ {"_set_name", &POA_IR::TypedefDef::_set_name_skel},
-+ {"_get_version", &POA_IR::TypedefDef::_get_version_skel},
-+ {"_set_version", &POA_IR::TypedefDef::_set_version_skel},
-+ {"_get_def_kind", &POA_IR::TypedefDef::_get_def_kind_skel},
-+ {"_get_defined_in", &POA_IR::TypedefDef::_get_defined_in_skel},
-+ {"destroy", &POA_IR::TypedefDef::destroy_skel},
-+ {"_get_absolute_name", &POA_IR::TypedefDef::_get_absolute_name_skel},
-+ {"_non_existent", &POA_IR::TypedefDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::TypedefDef::_get_containing_repository_skel},
-+ };
-
--CORBA::Boolean
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ static const signed char lookup[] =
-+ {
-+ -6, -2, -9, -3, 4, 5, -1, -43, 8, -43, -12, -2, -38, 14,
-+ -1, 15, -1, 16, 17, -1, -1, -1, -1, 18, -1, -1, -1, -1,
-+ -1, -1, -1, -1, -1, -1, -1, -1, 19,
-+ };
-+
-+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-+ {
-+ unsigned int key = hash (str, len);
-+
-+ if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-+ {
-+ int slot = lookup[key];
-+
-+ if (slot >= 0 && slot < MAX_HASH_VALUE)
-+ {
-+ const char *s = wordlist[slot].opname_;
-+
-+ if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-+ return &wordlist[slot];
-+ }
-+ else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-+ return 0;
-+ else
-+ {
-+ unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-+ const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-+ const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
-+
-+ while (--ptr >= base)
-+ if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-+ return ptr;
-+ }
-+ }
-+ }
-+ return 0;
- }
-+/* ending time is 11:23:09 */
-+static TAO_IR_TypedefDef_Perfect_Hash_OpTable tao_IR_TypedefDef_optable;
-
--void
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::result (IR::Contained_ptr result)
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Implementation
-+//
-+
-+// Factory function Implementation.
-+POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker *POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::the_TAO_TypedefDef_Strategized_Proxy_Broker (void)
- {
-- // Update the result.
-- this->_result = result;
-+ static POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ return &strategized_proxy_broker;
- }
-
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Repository *tao_impl
-- ,
-- CORBA::TypeCode_ptr tc,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- tc_ (tc)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::_TAO_TypedefDef_Strategized_Proxy_Broker (void)
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_tc = parameter_list->length ();
-- parameter_list->length (length_tc + 1);
-- (*parameter_list)[length_tc].argument <<= tc_;
-- (*parameter_list)[length_tc].mode = Dynamic::PARAM_IN;
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ this->proxy_cache_[i] = 0;
-
-- return safe_parameter_list._retn ();
- }
-
--Dynamic::ExceptionList *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::~_TAO_TypedefDef_Strategized_Proxy_Broker (void)
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ delete this->proxy_cache_[i];
-
-- return exception_list;
- }
-
--CORBA::Any *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+_TAO_TypedefDef_Proxy_Impl&
-+POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::select_proxy (
-+ IR_TypedefDef *object,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-+ TAO_ORB_Core::collocation_strategy (object);
-
-- CORBA::Any_var safe_result_any = result_any;
-+ if (this->proxy_cache_[strategy] != 0)
-+ return *this->proxy_cache_[strategy];
-
-- (*result_any) <<= this->_result;
-+ this->create_proxy (strategy, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-+
-+ return *this->proxy_cache_[strategy];
-
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
++ return IR_Repository::_unchecked_narrow (obj.in ());
}
- void
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode::result (CORBA::TypeCode_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
-
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::TAO_ServerRequestInfo_IR_Repository_get_primitive (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Repository *tao_impl
-- ,
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::TAO_ServerRequestInfo_IR_Repository_lookup_id (
+ TAO_ServerRequest &_tao_server_request,
+@@ -9335,7 +9316,7 @@
+ POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::TAO_ServerRequestInfo_IR_Repository_get_primitive (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::Repository *tao_impl,
- IR::PrimitiveKind & kind,
-- CORBA::Environment &
-+POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::create_proxy (
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_PrimitiveKind & kind,
+ CORBA::Environment &
)
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- kind_ (kind)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-+ if (this->proxy_cache_[strategy] == 0)
-+ {
-+ switch (strategy)
-+ {
-+ case TAO_ORB_Core::THRU_POA_STRATEGY:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
-+ _TAO_TypedefDef_ThruPOA_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ case TAO_ORB_Core::REMOTE_STRATEGY:
-+ default:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
-+ _TAO_TypedefDef_Remote_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ }
-
-- CORBA::ULong length_kind = parameter_list->length ();
-- parameter_list->length (length_kind + 1);
-- (*parameter_list)[length_kind].argument <<= this->kind_;
--
-- (*parameter_list)[length_kind].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ }
- }
-
--Dynamic::ExceptionList *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+
-+//
-+// End Strategized Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-+
-+_TAO_TypedefDef_Proxy_Broker *
-+_TAO_TypedefDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ ACE_UNUSED_ARG (obj);
-+ return ::POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::the_TAO_TypedefDef_Strategized_Proxy_Broker();
- }
-
--CORBA::Any *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+int
-+_TAO_TypedefDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
-+ ACE_UNUSED_ARG (_dummy_);
-
-- (*result_any) <<= this->_result;
-+ _TAO_TypedefDef_Proxy_Broker_Factory_function_pointer =
-+ _TAO_TypedefDef_Proxy_Broker_Factory_function;
-
-- return safe_result_any._retn ();
-+ return 0;
- }
-
--char *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+static int _TAO_TypedefDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-+ _TAO_TypedefDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_TypedefDef_Proxy_Broker_Factory_Initializer));
-
--CORBA::Boolean
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-
--void
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::result (IR::PrimitiveDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Proxy Implementation
-+//
-
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string::TAO_ServerRequestInfo_IR_Repository_create_string (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Repository *tao_impl
-- ,
-- const CORBA::ULong & bound,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- bound_ (bound)
-+POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl::_TAO_TypedefDef_ThruPOA_Proxy_Impl (void)
- {}
-
--Dynamic::ParameterList *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_bound = parameter_list->length ();
-- parameter_list->length (length_bound + 1);
-- (*parameter_list)[length_bound].argument <<= bound_;
-- (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string::result (IR::StringDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring::TAO_ServerRequestInfo_IR_Repository_create_wstring (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Repository *tao_impl
-- ,
-- const CORBA::ULong & bound,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- bound_ (bound)
-+POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl::~_TAO_TypedefDef_ThruPOA_Proxy_Impl (void)
- {}
-
--Dynamic::ParameterList *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_bound = parameter_list->length ();
-- parameter_list->length (length_bound + 1);
-- (*parameter_list)[length_bound].argument <<= bound_;
-- (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+// ThruPOA Implementation of the IDL interface methods
-
--CORBA::Any *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+//
-+// End ThruPOA Proxy Implementation
-+///////////////////////////////////////////////////////////////////////
-
--char *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+// skeleton constructor
-+POA_IR::TypedefDef::TypedefDef (void)
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ this->optable_ = &tao_IR_TypedefDef_optable;
- }
-
--CORBA::Boolean
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+// copy ctor
-+POA_IR::TypedefDef::TypedefDef (const TypedefDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
-+ POA_CORBA_IRObject (rhs),
-+ TAO_ServantBase (rhs)
-+{}
-
--void
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring::result (IR::WstringDef_ptr result)
-+// skeleton destructor
-+POA_IR::TypedefDef::~TypedefDef (void)
- {
-- // Update the result.
-- this->_result = result;
- }
-
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence::TAO_ServerRequestInfo_IR_Repository_create_sequence (
-+void POA_IR::TypedefDef::_is_a_skel (
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -9589,7 +9570,7 @@
TAO_ServerRequest &_tao_server_request,
-- POA_IR::Repository *tao_impl
-- ,
-- const CORBA::ULong & bound,
+ POA_IR::Repository *tao_impl,
+ const CORBA::ULong & bound,
- IR::IDLType_ptr element_type,
-- CORBA::Environment &
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &
)
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- bound_ (bound),
-- element_type_ (element_type)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_bound = parameter_list->length ();
-- parameter_list->length (length_bound + 1);
-- (*parameter_list)[length_bound].argument <<= bound_;
-- (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_element_type = parameter_list->length ();
-- parameter_list->length (length_element_type + 1);
-- (*parameter_list)[length_element_type].argument <<= this->element_type_;
--
-- (*parameter_list)[length_element_type].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::TypedefDef *_tao_impl = (POA_IR::TypedefDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = 0;
-+ CORBA::String_var value;
-+ if (!((_tao_in >> value.out ())))
-+ ACE_THROW (CORBA::MARSHAL ());
-
--CORBA::Boolean
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-+ ACE_CHECK;
-
--void
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence::result (IR::SequenceDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
- }
-
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array::TAO_ServerRequestInfo_IR_Repository_create_array (
-+void POA_IR::TypedefDef::_non_existent_skel (
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -9681,7 +9662,7 @@
TAO_ServerRequest &_tao_server_request,
-- POA_IR::Repository *tao_impl
-- ,
-- const CORBA::ULong & length,
+ POA_IR::Repository *tao_impl,
+ const CORBA::ULong & length,
- IR::IDLType_ptr element_type,
-- CORBA::Environment &
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &
)
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- length_ (length),
-- element_type_ (element_type)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_length = parameter_list->length ();
-- parameter_list->length (length_length + 1);
-- (*parameter_list)[length_length].argument <<= length_;
-- (*parameter_list)[length_length].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_element_type = parameter_list->length ();
-- parameter_list->length (length_element_type + 1);
-- (*parameter_list)[length_element_type].argument <<= this->element_type_;
--
-- (*parameter_list)[length_element_type].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+ POA_IR::TypedefDef *_tao_impl = (POA_IR::TypedefDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-+ ACE_CHECK;
-
--char *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
- }
-
--CORBA::Boolean
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+CORBA::Boolean POA_IR::TypedefDef::_is_a (
-+ const char* value,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ if (
-+ (!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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-+ return 1;
-+ else
-+ return 0;
- }
-
--void
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array::result (IR::ArrayDef_ptr result)
-+void* POA_IR::TypedefDef::_downcast (
-+ const char* logical_type_id
-+ )
- {
-- // Update the result.
-- this->_result = result;
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/TypedefDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::TypedefDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Contained_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-+ return ACE_static_cast (POA_IR::IDLType_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-+ return ACE_static_cast(PortableServer::Servant, this);
-+ return 0;
- }
-
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed::TAO_ServerRequestInfo_IR_Repository_create_fixed (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Repository *tao_impl
-- ,
-- const CORBA::UShort & digits,
-- const CORBA::Short & scale,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- digits_ (digits),
-- scale_ (scale)
--{}
--
--Dynamic::ParameterList *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::TypedefDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_digits = parameter_list->length ();
-- parameter_list->length (length_digits + 1);
-- (*parameter_list)[length_digits].argument <<= digits_;
-- (*parameter_list)[length_digits].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_scale = parameter_list->length ();
-- parameter_list->length (length_scale + 1);
-- (*parameter_list)[length_scale].argument <<= scale_;
-- (*parameter_list)[length_scale].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--Dynamic::ExceptionList *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+const char* POA_IR::TypedefDef::_interface_repository_id (void) const
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ return "IDL:omg.org/IR/TypedefDef:1.0";
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -9861,6 +9842,7 @@
}
--CORBA::Any *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR::TypedefDef*
-+POA_IR::TypedefDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-+ TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
-- CORBA::Any_var safe_result_any = result_any;
-+ CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
-- (*result_any) <<= this->_result;
-+ if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-+ else
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed::result (IR::FixedDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
-+ CORBA::Object_var obj = tmp;
-+ return IR_TypedefDef::_unchecked_narrow (obj.in ());
- }
-
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_ComponentRepository_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+class TAO_IR_StructDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_ComponentRepository_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
private:
- unsigned int hash (const char *str, unsigned int len);
+@@ -9868,7 +9850,7 @@
public:
const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
};
--/* starting time is 16:31:12 */
+-/* starting time is 18:47:27 */
+/* starting time is 11:23:09 */
/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ComponentRepository_Perfect_Hash_OpTable -N lookup */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_StructDef_Perfect_Hash_OpTable -N lookup */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ComponentRepository_Perfect_Hash_OpTable -N lookup */
unsigned int
--TAO_IR_ComponentRepository_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+TAO_IR_StructDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
- static const unsigned char asso_values[] =
- {
- #if defined (ACE_MVS)
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 15,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 5,
-- 54, 0, 25, 15, 54, 10, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 10, 0, 3,
-- 54, 25, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 0, 5, 54, 54, 54, 0, 20, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54,
--#else
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
-- 54, 54, 54, 54, 54, 15, 54, 5, 54, 0,
-- 25, 15, 54, 10, 54, 54, 54, 54, 10, 0,
-- 3, 54, 25, 54, 54, 0, 5, 54, 54, 54,
-- 0, 20, 54, 54, 54, 54, 54, 54,
--#endif /* ACE_MVS */
-- };
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 0,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 0,
-+ 52, 20, 3, 0, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 10, 15, 5,
-+ 52, 10, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 15, 15, 52, 52, 52, 15, 5, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52,
-+#else
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 0, 52, 0, 52, 20,
-+ 3, 0, 52, 52, 52, 52, 52, 52, 10, 15,
-+ 5, 52, 10, 52, 52, 15, 15, 52, 52, 52,
-+ 15, 5, 52, 52, 52, 52, 52, 52,
-+#endif /* ACE_MVS */
-+ };
- return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
- const class TAO_operation_db_entry *
--TAO_IR_ComponentRepository_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+TAO_IR_StructDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
- enum
- {
-- TOTAL_KEYWORDS = 29,
-- MIN_WORD_LENGTH = 5,
-- MAX_WORD_LENGTH = 22,
-- MIN_HASH_VALUE = 8,
-- MAX_HASH_VALUE = 53,
-- HASH_VALUE_RANGE = 46,
-- DUPLICATES = 2
-+ TOTAL_KEYWORDS = 33,
-+ MIN_WORD_LENGTH = 4,
-+ MAX_WORD_LENGTH = 26,
-+ MIN_HASH_VALUE = 5,
-+ MAX_HASH_VALUE = 51,
-+ HASH_VALUE_RANGE = 47,
-+ DUPLICATES = 7
- };
-
- static const class TAO_operation_db_entry wordlist[] =
- {
-- {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
-- {"contents", &POA_IR::ComponentRepository::contents_skel},
-- {"create_enum", &POA_IR::ComponentRepository::create_enum_skel},
-- {"create_alias", &POA_IR::ComponentRepository::create_alias_skel},
-- {"create_union", &POA_IR::ComponentRepository::create_union_skel},
-- {"create_value_box", &POA_IR::ComponentRepository::create_value_box_skel},
-- {"create_struct", &POA_IR::ComponentRepository::create_struct_skel},
-- {"create_exception", &POA_IR::ComponentRepository::create_exception_skel},
-- {"create_constant", &POA_IR::ComponentRepository::create_constant_skel},
-- {"create_component", &POA_IR::ComponentRepository::create_component_skel},
-- {"create_string", &POA_IR::ComponentRepository::create_string_skel},
-- {"create_wstring", &POA_IR::ComponentRepository::create_wstring_skel},
-- {"_is_a", &POA_IR::ComponentRepository::_is_a_skel},
-- {"create_home", &POA_IR::ComponentRepository::create_home_skel},
-- {"create_value", &POA_IR::ComponentRepository::create_value_skel},
-- {"create_module", &POA_IR::ComponentRepository::create_module_skel},
-- {"create_native", &POA_IR::ComponentRepository::create_native_skel},
-- {"create_sequence", &POA_IR::ComponentRepository::create_sequence_skel},
-- {"create_interface", &POA_IR::ComponentRepository::create_interface_skel},
-- {"create_array", &POA_IR::ComponentRepository::create_array_skel},
-- {"_non_existent", &POA_IR::ComponentRepository::_non_existent_skel},
-- {"lookup_name", &POA_IR::ComponentRepository::lookup_name_skel},
-- {"create_fixed", &POA_IR::ComponentRepository::create_fixed_skel},
-- {"get_primitive", &POA_IR::ComponentRepository::get_primitive_skel},
-- {"lookup", &POA_IR::ComponentRepository::lookup_skel},
-- {"describe_contents", &POA_IR::ComponentRepository::describe_contents_skel},
-- {"lookup_id", &POA_IR::ComponentRepository::lookup_id_skel},
-- {"get_canonical_typecode", &POA_IR::ComponentRepository::get_canonical_typecode_skel},
-- {"destroy", &POA_IR::ComponentRepository::destroy_skel},
-- {"_get_def_kind", &POA_IR::ComponentRepository::_get_def_kind_skel},
-+ {"",0},{"",0},{"",0},{"",0},{"",0},
-+ {"_is_a", &POA_IR::StructDef::_is_a_skel},
-+ {"_get_name", &POA_IR::StructDef::_get_name_skel},
-+ {"_get_type", &POA_IR::StructDef::_get_type_skel},
-+ {"_set_name", &POA_IR::StructDef::_set_name_skel},
-+ {"_get_id", &POA_IR::StructDef::_get_id_skel},
-+ {"_set_id", &POA_IR::StructDef::_set_id_skel},
-+ {"describe", &POA_IR::StructDef::describe_skel},
-+ {"destroy", &POA_IR::StructDef::destroy_skel},
-+ {"_get_def_kind", &POA_IR::StructDef::_get_def_kind_skel},
-+ {"_get_version", &POA_IR::StructDef::_get_version_skel},
-+ {"_set_version", &POA_IR::StructDef::_set_version_skel},
-+ {"_get_absolute_name", &POA_IR::StructDef::_get_absolute_name_skel},
-+ {"move", &POA_IR::StructDef::move_skel},
-+ {"_get_defined_in", &POA_IR::StructDef::_get_defined_in_skel},
-+ {"lookup_name", &POA_IR::StructDef::lookup_name_skel},
-+ {"lookup", &POA_IR::StructDef::lookup_skel},
-+ {"_get_members", &POA_IR::StructDef::_get_members_skel},
-+ {"_set_members", &POA_IR::StructDef::_set_members_skel},
-+ {"_non_existent", &POA_IR::StructDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::StructDef::_get_containing_repository_skel},
-+ {"create_value", &POA_IR::StructDef::create_value_skel},
-+ {"create_module", &POA_IR::StructDef::create_module_skel},
-+ {"create_native", &POA_IR::StructDef::create_native_skel},
-+ {"describe_contents", &POA_IR::StructDef::describe_contents_skel},
-+ {"create_interface", &POA_IR::StructDef::create_interface_skel},
-+ {"create_union", &POA_IR::StructDef::create_union_skel},
-+ {"create_exception", &POA_IR::StructDef::create_exception_skel},
-+ {"contents", &POA_IR::StructDef::contents_skel},
-+ {"create_enum", &POA_IR::StructDef::create_enum_skel},
-+ {"create_alias", &POA_IR::StructDef::create_alias_skel},
-+ {"create_struct", &POA_IR::StructDef::create_struct_skel},
-+ {"create_constant", &POA_IR::StructDef::create_constant_skel},
-+ {"create_value_box", &POA_IR::StructDef::create_value_box_skel},
- };
-
- static const signed char lookup[] =
- {
-- -1, -1, -1, -1, -1, -1, -1, -1, 8, -1, -1, 9, 10, -22,
-- -2, 11, 12, -1, 13, 14, 15, 16, -1, 17, 18, 19, 20, 21,
-- -68, -1, 24, 25, 26, 27, -1, -1, 28, 29, 30, -1, -1, 31,
-- 32, -1, 33, -1, -1, 34, -1, -1, -1, -1, 35, 36,
-+ -1, -1, -1, -6, -3, 5, -1, -9, -2, -57, -54, 11, -1, -14,
-+ -2, 12, 13, -55, 16, 17, 18, 19, -1, -1, -21, -2, 20, -54,
-+ 23, -26, -2, 24, 25, -55, -1, 28, 29, 30, -1, -1, -1, 31,
-+ -1, 32, -1, -1, 33, 34, 35, -1, 36, 37,
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -10011,38 +6550,37 @@
+@@ -10009,10 +9991,9 @@
}
return 0;
}
--/* ending time is 16:31:12 */
--static TAO_IR_ComponentRepository_Perfect_Hash_OpTable tao_IR_ComponentRepository_optable;
--
+-/* ending time is 18:47:27 */
+/* ending time is 11:23:09 */
-+static TAO_IR_StructDef_Perfect_Hash_OpTable tao_IR_StructDef_optable;
+ static TAO_IR_ComponentRepository_Perfect_Hash_OpTable tao_IR_ComponentRepository_optable;
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Implementation
//
-
- // Factory function Implementation.
--POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker *POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::the_TAO_ComponentRepository_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_StructDef_Strategized_Proxy_Broker *POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::the_TAO_StructDef_Strategized_Proxy_Broker (void)
- {
-- static POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker strategized_proxy_broker;
-+ static POA_IR::_TAO_StructDef_Strategized_Proxy_Broker strategized_proxy_broker;
- return &strategized_proxy_broker;
- }
-
--POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::_TAO_ComponentRepository_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::_TAO_StructDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- this->proxy_cache_[i] = 0;
-
- }
-
--POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::~_TAO_ComponentRepository_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::~_TAO_StructDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- delete this->proxy_cache_[i];
+@@ -10038,9 +10019,9 @@
}
-IR::_TAO_ComponentRepository_Proxy_Impl&
--POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::select_proxy (
++_TAO_ComponentRepository_Proxy_Impl&
+ POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::select_proxy (
- ::IR::ComponentRepository *object,
-+_TAO_StructDef_Proxy_Impl&
-+POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::select_proxy (
-+ IR_StructDef *object,
++ IR_ComponentRepository *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -10060,7 +6598,7 @@
- }
-
- void
--POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::create_proxy (
-+POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::create_proxy (
- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -10074,7 +6612,7 @@
+@@ -10072,7 +10053,7 @@
case TAO_ORB_Core::THRU_POA_STRATEGY:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
- POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl,
-+ _TAO_StructDef_ThruPOA_Proxy_Impl,
++ _TAO_ComponentRepository_ThruPOA_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -10084,7 +6622,7 @@
+@@ -10082,7 +10063,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
- ::IR::_TAO_ComponentRepository_Remote_Proxy_Impl,
-+ _TAO_StructDef_Remote_Proxy_Impl,
++ _TAO_ComponentRepository_Remote_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -10101,51 +6639,49 @@
+@@ -10099,26 +10080,26 @@
///////////////////////////////////////////////////////////////////////
-IR::_TAO_ComponentRepository_Proxy_Broker *
-IR__TAO_ComponentRepository_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_StructDef_Proxy_Broker *
-+_TAO_StructDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
++_TAO_ComponentRepository_Proxy_Broker *
++_TAO_ComponentRepository_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::the_TAO_ComponentRepository_Strategized_Proxy_Broker();
-+ return ::POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::the_TAO_StructDef_Strategized_Proxy_Broker();
+ return ::POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::the_TAO_ComponentRepository_Strategized_Proxy_Broker();
}
int
-IR__TAO_ComponentRepository_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_StructDef_Proxy_Broker_Factory_Initializer (long _dummy_)
++_TAO_ComponentRepository_Proxy_Broker_Factory_Initializer (long _dummy_)
{
ACE_UNUSED_ARG (_dummy_);
- IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer =
- IR__TAO_ComponentRepository_Proxy_Broker_Factory_function;
-+ _TAO_StructDef_Proxy_Broker_Factory_function_pointer =
-+ _TAO_StructDef_Proxy_Broker_Factory_function;
++ _TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer =
++ _TAO_ComponentRepository_Proxy_Broker_Factory_function;
return 0;
}
-static int IR__TAO_ComponentRepository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- IR__TAO_ComponentRepository_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ComponentRepository_Proxy_Broker_Factory_Initializer));
-+static int _TAO_StructDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-+ _TAO_StructDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_StructDef_Proxy_Broker_Factory_Initializer));
++static int _TAO_ComponentRepository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
++ _TAO_ComponentRepository_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ComponentRepository_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
- // ThruPOA Proxy Implementation
- //
-
--POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::_TAO_ComponentRepository_ThruPOA_Proxy_Impl (void)
-+POA_IR::_TAO_StructDef_ThruPOA_Proxy_Impl::_TAO_StructDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_StructDef_ThruPOA_Proxy_Impl::~_TAO_StructDef_ThruPOA_Proxy_Impl (void)
- {}
+@@ -10130,20 +10111,20 @@
// ThruPOA Implementation of the IDL interface methods
-IR::ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_component (
-+IR::StructMemberSeq * POA_IR::_TAO_StructDef_ThruPOA_Proxy_Impl::members (
++IR_ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_component (
CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
+ 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 ((
@@ -13405,48 +2613,26 @@
))
{
- IR::ComponentDef_var _tao_retval;
-+ IR_StructMemberSeq_var _tao_retval;
++ IR_ComponentDef_var _tao_retval;
ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -10153,67 +6689,51 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "create_component",
-+ "members",
- forward_to.out (),
- ACE_TRY_ENV
- );
- ACE_CHECK_RETURN (0);
- return ACE_reinterpret_cast (
-- POA_IR::ComponentRepository_ptr,
-+ POA_IR::StructDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ComponentRepository:1.0"
-+ "IDL:omg.org/IR/StructDef:1.0"
- )
-- )->create_component (
-- id,
-- name,
-- version,
-- base_component,
-- supports_interfaces,
-+ )->members (
- ACE_TRY_ENV
+@@ -10171,21 +10152,21 @@
);
}
-IR::HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home (
-+void POA_IR::_TAO_StructDef_ThruPOA_Proxy_Impl::members (
++IR_HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home (
CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
+ const char * id,
+ const char * name,
+ const char * version,
- IR::HomeDef_ptr base_home,
- IR::ComponentDef_ptr managed_component,
- IR::ValueDef_ptr primary_key,
-+ const IR_StructMemberSeq & members,
++ IR_HomeDef_ptr base_home,
++ IR_ComponentDef_ptr managed_component,
++ IR_ValueDef_ptr primary_key,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
@@ -13454,331 +2640,98 @@
))
{
- IR::HomeDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
++ IR_HomeDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "create_home",
-+ "members",
- forward_to.out (),
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ComponentRepository_ptr,
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::StructDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ComponentRepository:1.0"
-+ "IDL:omg.org/IR/StructDef:1.0"
- )
-- )->create_home (
-- id,
-- name,
-- version,
-- base_home,
-- managed_component,
-- primary_key,
-+ )->members (
-+ members,
- ACE_TRY_ENV
- );
-+ return;
- }
-
- //
-@@ -10221,285 +6741,128 @@
- ///////////////////////////////////////////////////////////////////////
-
- // skeleton constructor
--POA_IR::ComponentRepository::ComponentRepository (void)
-+POA_IR::StructDef::StructDef (void)
- {
-- this->optable_ = &tao_IR_ComponentRepository_optable;
-+ this->optable_ = &tao_IR_StructDef_optable;
- }
-
- // copy ctor
--POA_IR::ComponentRepository::ComponentRepository (const ComponentRepository& rhs)
-- : ACE_NESTED_CLASS (POA_IR,Repository) (rhs),
-+POA_IR::StructDef::StructDef (const StructDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,TypedefDef) (rhs),
+@@ -10228,7 +10209,7 @@
+ POA_IR::ComponentRepository::ComponentRepository (const ComponentRepository& rhs)
+ : ACE_NESTED_CLASS (POA_IR,Repository) (rhs),
ACE_NESTED_CLASS (POA_IR,Container) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+ POA_CORBA_IRObject (rhs),
TAO_ServantBase (rhs)
{}
- // skeleton destructor
--POA_IR::ComponentRepository::~ComponentRepository (void)
-+POA_IR::StructDef::~StructDef (void)
- {
- }
-
--void POA_IR::ComponentRepository::create_component_skel (
-+void POA_IR::StructDef::_get_members_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *)_tao_object_reference;
--
-- IR::ComponentDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
+@@ -10247,12 +10228,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *)_tao_object_reference;
+
+- IR::ComponentDef_var _tao_retval;
++ IR_ComponentDef_var _tao_retval;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
- IR::ComponentDef_var base_component;
- IR::InterfaceDefSeq supports_interfaces;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> base_component.out ()) &&
-- (_tao_in >> supports_interfaces)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+ POA_IR::StructDef *_tao_impl = (POA_IR::StructDef *)_tao_object_reference;
-
-+ IR_StructMemberSeq_var _tao_retval;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_component ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- base_component.in (),
-- supports_interfaces,
-+ _tao_retval = _tao_impl->members (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_component (
-- id.in (),
-- name.in (),
-- version.in (),
-- base_component.in (),
-- supports_interfaces,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ComponentDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
++ IR_ComponentDef_var base_component;
++ IR_InterfaceDefSeq supports_interfaces;
if (!(
- (_tao_out << _tao_retval.in ())
+ (_tao_in >> id.out ()) &&
+ (_tao_in >> name.out ()) &&
+@@ -10262,7 +10243,6 @@
))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void POA_IR::ComponentRepository::create_home_skel (
-+void POA_IR::StructDef::_set_members_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -10298,7 +10278,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ComponentDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_ComponentDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -10352,13 +10332,13 @@
TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *)_tao_object_reference;
-+ POA_IR::StructDef *_tao_impl = (POA_IR::StructDef *)_tao_object_reference;
-
-- IR::HomeDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
+ POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *)_tao_object_reference;
+
+- IR::HomeDef_var _tao_retval;
++ IR_HomeDef_var _tao_retval;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
- IR::HomeDef_var base_home;
- IR::ComponentDef_var managed_component;
- IR::ValueDef_var primary_key;
-+ IR_StructMemberSeq members;
++ IR_HomeDef_var base_home;
++ IR_ComponentDef_var managed_component;
++ IR_ValueDef_var primary_key;
if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> base_home.out ()) &&
-- (_tao_in >> managed_component.out ()) &&
-- (_tao_in >> primary_key.out ())
-+ (_tao_in >> members)
+ (_tao_in >> id.out ()) &&
+ (_tao_in >> name.out ()) &&
+@@ -10369,7 +10349,6 @@
))
-- ACE_THROW (CORBA::MARSHAL());
-+ ACE_THROW (CORBA::MARSHAL () );
-
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_home ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- base_home.in (),
-- managed_component.in (),
-- primary_key.in (),
-+ _tao_impl->members (
-+ members,
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_home (
-- id.in (),
-- name.in (),
-- version.in (),
-- base_home.in (),
-- managed_component.in (),
-- primary_key.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::HomeDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-
-+ _tao_server_request.init_reply ();
- }
-
--void POA_IR::ComponentRepository::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::StructDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *) _tao_object_reference;
-+ POA_IR::StructDef *_tao_impl = (POA_IR::StructDef *) _tao_object_reference;
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -10407,7 +10386,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::HomeDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_HomeDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -10462,7 +10441,7 @@
+ POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *) _tao_object_reference;
CORBA::Boolean _tao_retval = 0;
CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
ACE_THROW (CORBA::MARSHAL ());
--
-+
+
_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -10470,7 +10449,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -13786,21 +2739,8 @@
ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::ComponentRepository::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::StructDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *) _tao_object_reference;
-+ POA_IR::StructDef *_tao_impl = (POA_IR::StructDef *) _tao_object_reference;
- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -10487,7 +10466,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -13808,2071 +2748,385 @@
ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Boolean POA_IR::ComponentRepository::_is_a (
-+CORBA::Boolean POA_IR::StructDef::_is_a (
- const 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/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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
- return 1;
-@@ -10507,35 +6870,39 @@
- return 0;
- }
-
--void* POA_IR::ComponentRepository::_downcast (
-+void* POA_IR::StructDef::_downcast (
- const char* logical_type_id
- )
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ComponentRepository:1.0") == 0)
-- return ACE_static_cast (POA_IR::ComponentRepository_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Repository:1.0") == 0)
-- return ACE_static_cast (POA_IR::Repository_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/StructDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::StructDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/TypedefDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::TypedefDef_ptr, this);
+@@ -10518,7 +10497,7 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
return ACE_static_cast (POA_IR::Container_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Contained_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-+ return ACE_static_cast (POA_IR::IDLType_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
- }
-
--void POA_IR::ComponentRepository::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::StructDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--const char* POA_IR::ComponentRepository::_interface_repository_id (void) const
-+const char* POA_IR::StructDef::_interface_repository_id (void) const
- {
-- return "IDL:omg.org/IR/ComponentRepository:1.0";
-+ return "IDL:omg.org/IR/StructDef:1.0";
- }
-
--IR::ComponentRepository*
--POA_IR::ComponentRepository::_this (CORBA_Environment &ACE_TRY_ENV)
-+IR::StructDef*
-+POA_IR::StructDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-@@ -10548,366 +6915,132 @@
+@@ -10548,10 +10527,9 @@
ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
CORBA::Object_var obj = tmp;
- return ::IR::ComponentRepository::_unchecked_narrow (obj.in ());
--}
--
++ return IR_ComponentRepository::_unchecked_narrow (obj.in ());
+ }
+
-
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_component::TAO_ServerRequestInfo_IR_ComponentRepository_create_component (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentRepository *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_component::TAO_ServerRequestInfo_IR_ComponentRepository_create_component (
+ TAO_ServerRequest &_tao_server_request,
+@@ -10559,8 +10537,8 @@
+ const char * id,
+ const char * name,
+ const char * version,
- IR::ComponentDef_ptr base_component,
- const IR::InterfaceDefSeq & supports_interfaces,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- base_component_ (base_component),
-- supports_interfaces_ (supports_interfaces)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_component::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_base_component = parameter_list->length ();
-- parameter_list->length (length_base_component + 1);
-- (*parameter_list)[length_base_component].argument <<= this->base_component_;
--
-- (*parameter_list)[length_base_component].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_supports_interfaces = parameter_list->length ();
-- parameter_list->length (length_supports_interfaces + 1);
-- (*parameter_list)[length_supports_interfaces].argument <<= this->supports_interfaces_;
--
-- (*parameter_list)[length_supports_interfaces].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_component::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_component::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_component::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (IR::ComponentDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_home::TAO_ServerRequestInfo_IR_ComponentRepository_create_home (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentRepository *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
++ IR_ComponentDef_ptr base_component,
++ const IR_InterfaceDefSeq & supports_interfaces,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -10673,9 +10651,9 @@
+ 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_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- base_home_ (base_home),
-- managed_component_ (managed_component),
-- primary_key_ (primary_key)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_home::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_base_home = parameter_list->length ();
-- parameter_list->length (length_base_home + 1);
-- (*parameter_list)[length_base_home].argument <<= this->base_home_;
--
-- (*parameter_list)[length_base_home].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_managed_component = parameter_list->length ();
-- parameter_list->length (length_managed_component + 1);
-- (*parameter_list)[length_managed_component].argument <<= this->managed_component_;
--
-- (*parameter_list)[length_managed_component].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_primary_key = parameter_list->length ();
-- parameter_list->length (length_primary_key + 1);
-- (*parameter_list)[length_primary_key].argument <<= this->primary_key_;
--
-- (*parameter_list)[length_primary_key].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_home::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_home::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_home::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (IR::HomeDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
-+ return IR_StructDef::_unchecked_narrow (obj.in ());
++ IR_HomeDef_ptr base_home,
++ IR_ComponentDef_ptr managed_component,
++ IR_ValueDef_ptr primary_key,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -10790,6 +10768,7 @@
}
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_ModuleDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+class TAO_IR_UnionDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_ModuleDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
private:
- unsigned int hash (const char *str, unsigned int len);
+@@ -10797,7 +10776,7 @@
public:
const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
};
--/* starting time is 16:31:12 */
+-/* starting time is 18:47:27 */
+/* starting time is 11:23:09 */
/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ModuleDef_Perfect_Hash_OpTable -N lookup */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_UnionDef_Perfect_Hash_OpTable -N lookup */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ModuleDef_Perfect_Hash_OpTable -N lookup */
unsigned int
--TAO_IR_ModuleDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+TAO_IR_UnionDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
- static const unsigned char asso_values[] =
- {
- #if defined (ACE_MVS)
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 10,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 0,
-- 52, 0, 15, 0, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 20, 0, 5,
-- 52, 10, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 10, 20, 52, 52, 52, 10, 15, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 0,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 0,
-+ 68, 25, 3, 0, 0, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 10, 0, 10,
-+ 68, 10, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 30, 15, 68, 68, 68, 5, 5, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68,
- #else
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 10, 52, 0, 52, 0,
-- 15, 0, 52, 52, 52, 52, 52, 52, 20, 0,
-- 5, 52, 10, 52, 52, 10, 20, 52, 52, 52,
-- 10, 15, 52, 52, 52, 52, 52, 52,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-+ 68, 68, 68, 68, 68, 0, 68, 0, 68, 25,
-+ 3, 0, 0, 68, 68, 68, 68, 68, 10, 0,
-+ 10, 68, 10, 68, 68, 30, 15, 68, 68, 68,
-+ 5, 5, 68, 68, 68, 68, 68, 68,
- #endif /* ACE_MVS */
- };
- return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
- const class TAO_operation_db_entry *
--TAO_IR_ModuleDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+TAO_IR_UnionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
- enum
- {
-- TOTAL_KEYWORDS = 30,
-+ TOTAL_KEYWORDS = 36,
- MIN_WORD_LENGTH = 4,
-- MAX_WORD_LENGTH = 26,
-+ MAX_WORD_LENGTH = 27,
- MIN_HASH_VALUE = 4,
-- MAX_HASH_VALUE = 51,
-- HASH_VALUE_RANGE = 48,
-- DUPLICATES = 5
-+ MAX_HASH_VALUE = 67,
-+ HASH_VALUE_RANGE = 64,
-+ DUPLICATES = 8
- };
-
- static const class TAO_operation_db_entry wordlist[] =
- {
- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::ModuleDef::move_skel},
-- {"create_enum", &POA_IR::ModuleDef::create_enum_skel},
-- {"create_value", &POA_IR::ModuleDef::create_value_skel},
-- {"create_module", &POA_IR::ModuleDef::create_module_skel},
-- {"create_native", &POA_IR::ModuleDef::create_native_skel},
-- {"_is_a", &POA_IR::ModuleDef::_is_a_skel},
-- {"create_interface", &POA_IR::ModuleDef::create_interface_skel},
-- {"create_union", &POA_IR::ModuleDef::create_union_skel},
-- {"contents", &POA_IR::ModuleDef::contents_skel},
-- {"_get_name", &POA_IR::ModuleDef::_get_name_skel},
-- {"_set_name", &POA_IR::ModuleDef::_set_name_skel},
-- {"create_exception", &POA_IR::ModuleDef::create_exception_skel},
-- {"create_alias", &POA_IR::ModuleDef::create_alias_skel},
-- {"describe", &POA_IR::ModuleDef::describe_skel},
-- {"create_value_box", &POA_IR::ModuleDef::create_value_box_skel},
-- {"_get_version", &POA_IR::ModuleDef::_get_version_skel},
-- {"_set_version", &POA_IR::ModuleDef::_set_version_skel},
-- {"_get_absolute_name", &POA_IR::ModuleDef::_get_absolute_name_skel},
-- {"_get_defined_in", &POA_IR::ModuleDef::_get_defined_in_skel},
-- {"lookup_name", &POA_IR::ModuleDef::lookup_name_skel},
-- {"_get_id", &POA_IR::ModuleDef::_get_id_skel},
-- {"_set_id", &POA_IR::ModuleDef::_set_id_skel},
-- {"create_struct", &POA_IR::ModuleDef::create_struct_skel},
-- {"create_constant", &POA_IR::ModuleDef::create_constant_skel},
-- {"lookup", &POA_IR::ModuleDef::lookup_skel},
-- {"destroy", &POA_IR::ModuleDef::destroy_skel},
-- {"_get_def_kind", &POA_IR::ModuleDef::_get_def_kind_skel},
-- {"describe_contents", &POA_IR::ModuleDef::describe_contents_skel},
-- {"_non_existent", &POA_IR::ModuleDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::ModuleDef::_get_containing_repository_skel},
-+ {"move", &POA_IR::UnionDef::move_skel},
-+ {"_is_a", &POA_IR::UnionDef::_is_a_skel},
-+ {"_get_name", &POA_IR::UnionDef::_get_name_skel},
-+ {"_get_type", &POA_IR::UnionDef::_get_type_skel},
-+ {"_set_name", &POA_IR::UnionDef::_set_name_skel},
-+ {"_get_id", &POA_IR::UnionDef::_get_id_skel},
-+ {"_set_id", &POA_IR::UnionDef::_set_id_skel},
-+ {"describe", &POA_IR::UnionDef::describe_skel},
-+ {"destroy", &POA_IR::UnionDef::destroy_skel},
-+ {"_get_def_kind", &POA_IR::UnionDef::_get_def_kind_skel},
-+ {"_get_absolute_name", &POA_IR::UnionDef::_get_absolute_name_skel},
-+ {"lookup_name", &POA_IR::UnionDef::lookup_name_skel},
-+ {"_get_version", &POA_IR::UnionDef::_get_version_skel},
-+ {"_set_version", &POA_IR::UnionDef::_set_version_skel},
-+ {"_get_discriminator_type", &POA_IR::UnionDef::_get_discriminator_type_skel},
-+ {"_get_defined_in", &POA_IR::UnionDef::_get_defined_in_skel},
-+ {"lookup", &POA_IR::UnionDef::lookup_skel},
-+ {"_get_discriminator_type_def", &POA_IR::UnionDef::_get_discriminator_type_def_skel},
-+ {"_set_discriminator_type_def", &POA_IR::UnionDef::_set_discriminator_type_def_skel},
-+ {"_non_existent", &POA_IR::UnionDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::UnionDef::_get_containing_repository_skel},
-+ {"create_enum", &POA_IR::UnionDef::create_enum_skel},
-+ {"create_value", &POA_IR::UnionDef::create_value_skel},
-+ {"create_module", &POA_IR::UnionDef::create_module_skel},
-+ {"create_native", &POA_IR::UnionDef::create_native_skel},
-+ {"create_interface", &POA_IR::UnionDef::create_interface_skel},
-+ {"_get_members", &POA_IR::UnionDef::_get_members_skel},
-+ {"_set_members", &POA_IR::UnionDef::_set_members_skel},
-+ {"create_value_box", &POA_IR::UnionDef::create_value_box_skel},
-+ {"create_union", &POA_IR::UnionDef::create_union_skel},
-+ {"describe_contents", &POA_IR::UnionDef::describe_contents_skel},
-+ {"create_exception", &POA_IR::UnionDef::create_exception_skel},
-+ {"create_struct", &POA_IR::UnionDef::create_struct_skel},
-+ {"create_constant", &POA_IR::UnionDef::create_constant_skel},
-+ {"contents", &POA_IR::UnionDef::contents_skel},
-+ {"create_alias", &POA_IR::UnionDef::create_alias_skel},
- };
-
- static const signed char lookup[] =
- {
-- -1, -1, -1, -1, 4, -7, -2, -13, -2, -19, -2, 5, 6, -59,
-- -1, 9, 10, 11, 12, -63, -1, 15, 16, 17, -24, -2, 18, -69,
-- 21, -1, 22, 23, -59, 26, -1, 27, 28, 29, 30, -1, -1, -1,
-- 31, 32, -1, -1, -1, -1, -1, -1, -1, 33,
-+ -1, -1, -6, -3, 4, 5, -1, -9, -2, -74, -70, 11, -1, -16,
-+ -2, 12, 13, -1, 14, -21, -2, 15, -76, 18, -1, 19, 20, -75,
-+ 23, -1, -1, 24, -1, -1, -27, -2, 25, 26, -71, -30, -2, 29,
-+ -70, -1, -1, -1, 32, 33, -1, -1, 34, 35, -1, 36, -1, 37,
-+ -1, -1, -1, -1, -1, -1, -1, 38, -1, -1, -1, 39,
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -10941,38 +7074,37 @@
+@@ -10939,10 +10918,9 @@
}
return 0;
}
--/* ending time is 16:31:12 */
--static TAO_IR_ModuleDef_Perfect_Hash_OpTable tao_IR_ModuleDef_optable;
--
+-/* ending time is 18:47:27 */
+/* ending time is 11:23:09 */
-+static TAO_IR_UnionDef_Perfect_Hash_OpTable tao_IR_UnionDef_optable;
+ static TAO_IR_ModuleDef_Perfect_Hash_OpTable tao_IR_ModuleDef_optable;
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Implementation
//
-
- // Factory function Implementation.
--POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker *POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::the_TAO_ModuleDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker *POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::the_TAO_UnionDef_Strategized_Proxy_Broker (void)
- {
-- static POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ static POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker strategized_proxy_broker;
- return &strategized_proxy_broker;
- }
-
--POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::_TAO_ModuleDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::_TAO_UnionDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- this->proxy_cache_[i] = 0;
-
- }
-
--POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::~_TAO_ModuleDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::~_TAO_UnionDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- delete this->proxy_cache_[i];
+@@ -10968,9 +10946,9 @@
}
-IR::_TAO_ModuleDef_Proxy_Impl&
--POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::select_proxy (
++_TAO_ModuleDef_Proxy_Impl&
+ POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::select_proxy (
- ::IR::ModuleDef *object,
-+_TAO_UnionDef_Proxy_Impl&
-+POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::select_proxy (
-+ IR_UnionDef *object,
++ IR_ModuleDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -10990,7 +7122,7 @@
- }
-
- void
--POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::create_proxy (
-+POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::create_proxy (
- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -11004,7 +7136,7 @@
+@@ -11002,7 +10980,7 @@
case TAO_ORB_Core::THRU_POA_STRATEGY:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
- POA_IR::_TAO_ModuleDef_ThruPOA_Proxy_Impl,
-+ _TAO_UnionDef_ThruPOA_Proxy_Impl,
++ _TAO_ModuleDef_ThruPOA_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -11014,7 +7146,7 @@
+@@ -11012,7 +10990,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
- ::IR::_TAO_ModuleDef_Remote_Proxy_Impl,
-+ _TAO_UnionDef_Remote_Proxy_Impl,
++ _TAO_ModuleDef_Remote_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -11031,185 +7163,477 @@
+@@ -11029,26 +11007,26 @@
///////////////////////////////////////////////////////////////////////
-IR::_TAO_ModuleDef_Proxy_Broker *
-IR__TAO_ModuleDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_UnionDef_Proxy_Broker *
-+_TAO_UnionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
++_TAO_ModuleDef_Proxy_Broker *
++_TAO_ModuleDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::the_TAO_ModuleDef_Strategized_Proxy_Broker();
-+ return ::POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::the_TAO_UnionDef_Strategized_Proxy_Broker();
+ return ::POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::the_TAO_ModuleDef_Strategized_Proxy_Broker();
}
int
-IR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_UnionDef_Proxy_Broker_Factory_Initializer (long _dummy_)
++_TAO_ModuleDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
ACE_UNUSED_ARG (_dummy_);
- IR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer =
- IR__TAO_ModuleDef_Proxy_Broker_Factory_function;
-+ _TAO_UnionDef_Proxy_Broker_Factory_function_pointer =
-+ _TAO_UnionDef_Proxy_Broker_Factory_function;
++ _TAO_ModuleDef_Proxy_Broker_Factory_function_pointer =
++ _TAO_ModuleDef_Proxy_Broker_Factory_function;
return 0;
}
-static int IR__TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- IR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_UnionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-+ _TAO_UnionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_UnionDef_Proxy_Broker_Factory_Initializer));
++static int _TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
++ _TAO_ModuleDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ModuleDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
- // ThruPOA Proxy Implementation
- //
-
--POA_IR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_TAO_ModuleDef_ThruPOA_Proxy_Impl (void)
-+POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::_TAO_UnionDef_ThruPOA_Proxy_Impl (void)
- {}
-
--// ThruPOA Implementation of the IDL interface methods
--
--//
--// End ThruPOA Proxy Implementation
--///////////////////////////////////////////////////////////////////////
--
--// skeleton constructor
--POA_IR::ModuleDef::ModuleDef (void)
--{
-- this->optable_ = &tao_IR_ModuleDef_optable;
--}
--
--// copy ctor
--POA_IR::ModuleDef::ModuleDef (const ModuleDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-- ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+@@ -11074,7 +11052,7 @@
+ POA_IR::ModuleDef::ModuleDef (const ModuleDef& rhs)
+ : ACE_NESTED_CLASS (POA_IR,Container) (rhs),
+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-- TAO_ServantBase (rhs)
-+POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::~_TAO_UnionDef_ThruPOA_Proxy_Impl (void)
++ POA_CORBA_IRObject (rhs),
+ TAO_ServantBase (rhs)
{}
--// skeleton destructor
--POA_IR::ModuleDef::~ModuleDef (void)
--{
--}
-+// ThruPOA Implementation of the IDL interface methods
-
--void POA_IR::ModuleDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-+CORBA::TypeCode_ptr POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type (
-+ CORBA_Object *_collocated_tao_target_,
- CORBA::Environment &ACE_TRY_ENV
- )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ModuleDef *_tao_impl = (POA_IR::ModuleDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = 0;
-- CORBA::String_var value;
+@@ -11094,7 +11072,7 @@
+ POA_IR::ModuleDef *_tao_impl = (POA_IR::ModuleDef *) _tao_object_reference;
+ CORBA::Boolean _tao_retval = 0;
+ CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
-- ACE_THROW (CORBA::MARSHAL ());
--
-- _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
++ if (!((_tao_in >> value.out ())))
+ ACE_THROW (CORBA::MARSHAL ());
+
+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+@@ -11102,7 +11080,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
-+ CORBA::TypeCode_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "discriminator_type",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::UnionDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/UnionDef:1.0"
-+ )
-+ )->discriminator_type (
-+ ACE_TRY_ENV
-+ );
++ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
+ ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::ModuleDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-+IR::IDLType_ptr POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
-+ CORBA_Object *_collocated_tao_target_,
- CORBA::Environment &ACE_TRY_ENV
- )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- POA_IR::ModuleDef *_tao_impl = (POA_IR::ModuleDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+@@ -11119,7 +11097,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
-+ IR_IDLType_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "discriminator_type_def",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::UnionDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/UnionDef:1.0"
-+ )
-+ )->discriminator_type_def (
-+ ACE_TRY_ENV
-+ );
++ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
+ ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Boolean POA_IR::ModuleDef::_is_a (
-- const char* value,
-+void POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
-+ CORBA_Object *_collocated_tao_target_,
-+ IR_IDLType_ptr discriminator_type_def,
- CORBA::Environment &ACE_TRY_ENV
- )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- if (
-- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ModuleDef: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/CORBA/IRObject:1.0")) ||
-- (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-- return 1;
-- else
-- return 0;
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "discriminator_type_def",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::UnionDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/UnionDef:1.0"
-+ )
-+ )->discriminator_type_def (
-+ discriminator_type_def,
-+ ACE_TRY_ENV
-+ );
-+ return;
- }
-
--void* POA_IR::ModuleDef::_downcast (
-- const char* logical_type_id
-+IR::UnionMemberSeq * POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::members (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
- )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ModuleDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::ModuleDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-- return ACE_static_cast (POA_IR::Container_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-- return ACE_static_cast (POA_IR::Contained_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+@@ -11150,7 +11128,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
+ return ACE_static_cast (POA_IR::Contained_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-- return ACE_static_cast(PortableServer::Servant, this);
-- return 0;
-+ IR_UnionMemberSeq_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "members",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::UnionDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/UnionDef:1.0"
-+ )
-+ )->members (
-+ ACE_TRY_ENV
-+ );
- }
-
--void POA_IR::ModuleDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::members (
-+ CORBA_Object *_collocated_tao_target_,
-+ const IR_UnionMemberSeq & members,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "members",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::UnionDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/UnionDef:1.0"
-+ )
-+ )->members (
-+ members,
-+ ACE_TRY_ENV
-+ );
-+ return;
- }
-
--const char* POA_IR::ModuleDef::_interface_repository_id (void) const
-+//
-+// End ThruPOA Proxy Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-+// skeleton constructor
-+POA_IR::UnionDef::UnionDef (void)
- {
-- return "IDL:omg.org/IR/ModuleDef:1.0";
-+ this->optable_ = &tao_IR_UnionDef_optable;
- }
-
--IR::ModuleDef*
--POA_IR::ModuleDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+// copy ctor
-+POA_IR::UnionDef::UnionDef (const UnionDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,TypedefDef) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
-+ POA_CORBA_IRObject (rhs),
-+ TAO_ServantBase (rhs)
-+{}
-+
-+// skeleton destructor
-+POA_IR::UnionDef::~UnionDef (void)
- {
-- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Object_ptr tmp = CORBA::Object::_nil ();
--
-- if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-- else
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
--
-- CORBA::Object_var obj = tmp;
++ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+ return ACE_static_cast(PortableServer::Servant, this);
+ return 0;
+@@ -11180,12 +11158,12 @@
+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
+
+ CORBA::Object_var obj = tmp;
- return ::IR::ModuleDef::_unchecked_narrow (obj.in ());
++ return IR_ModuleDef::_unchecked_narrow (obj.in ());
}
-+void POA_IR::UnionDef::_get_discriminator_type_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *)_tao_object_reference;
-+
-+ CORBA::TypeCode_var _tao_retval;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_ConstantDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+ _tao_retval = _tao_impl->discriminator_type (
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+}
-+
-+void POA_IR::UnionDef::_get_discriminator_type_def_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
--private:
-- unsigned int hash (const char *str, unsigned int len);
--public:
-- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
--};
--/* starting time is 16:31:12 */
--/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ConstantDef_Perfect_Hash_OpTable -N lookup */
--unsigned int
--TAO_IR_ConstantDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+ POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *)_tao_object_reference;
-+
-+ IR_IDLType_var _tao_retval;
-+
-+ _tao_retval = _tao_impl->discriminator_type_def (
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+}
-+
-+void POA_IR::UnionDef::_set_discriminator_type_def_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- static const unsigned char asso_values[] =
-- {
--#if defined (ACE_MVS)
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *)_tao_object_reference;
-+
-+ IR_IDLType_var discriminator_type_def;
-+ if (!(
-+ (_tao_in >> discriminator_type_def.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_impl->discriminator_type_def (
-+ discriminator_type_def.in (),
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+}
-+
-+void POA_IR::UnionDef::_get_members_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *)_tao_object_reference;
-+
-+ IR_UnionMemberSeq_var _tao_retval;
-+
-+ _tao_retval = _tao_impl->members (
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+}
-+
-+void POA_IR::UnionDef::_set_members_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *)_tao_object_reference;
-+
-+ IR_UnionMemberSeq members;
-+ if (!(
-+ (_tao_in >> members)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_impl->members (
-+ members,
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+}
-+
-+void POA_IR::UnionDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+{
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = 0;
-+ CORBA::String_var value;
-+ if (!((_tao_in >> value.out ())))
-+ ACE_THROW (CORBA::MARSHAL ());
-+
-+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
-+}
-+
-+void POA_IR::UnionDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+{
-+ POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
-+}
-+
-+CORBA::Boolean POA_IR::UnionDef::_is_a (
-+ const 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-+ return 1;
-+ else
-+ return 0;
-+}
-+
-+void* POA_IR::UnionDef::_downcast (
-+ const char* logical_type_id
-+ )
-+{
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/UnionDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::UnionDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/TypedefDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::TypedefDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Container_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Contained_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-+ return ACE_static_cast (POA_IR::IDLType_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-+ return ACE_static_cast(PortableServer::Servant, this);
-+ return 0;
-+}
-+
-+void POA_IR::UnionDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+{
-+ this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
-+}
-+
-+const char* POA_IR::UnionDef::_interface_repository_id (void) const
-+{
-+ return "IDL:omg.org/IR/UnionDef:1.0";
-+}
-+
-+IR::UnionDef*
-+POA_IR::UnionDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+{
-+ TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (0);
-+
-+ CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-+
-+ if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-+ else
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-+
-+ CORBA::Object_var obj = tmp;
-+ return IR_UnionDef::_unchecked_narrow (obj.in ());
-+}
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ #endif /* TAO_HAS_INTERCEPTORS */
+
-+class TAO_IR_EnumDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+{
-+private:
-+ unsigned int hash (const char *str, unsigned int len);
-+public:
-+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-+};
-+/* starting time is 11:23:10 */
-+/* C++ code produced by gperf version 2.8 (ACE version) */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EnumDef_Perfect_Hash_OpTable -N lookup */
-+unsigned int
-+TAO_IR_EnumDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+{
-+ static const unsigned char asso_values[] =
-+ {
-+#if defined (ACE_MVS)
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-@@ -11217,10 +7641,10 @@
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 0, 0, 10, 37, 37, 37, 37, 37,
-+ 37, 37, 0, 0, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 15, 37, 37, 37, 37, 10, 37,
-+ 37, 37, 10, 10, 37, 37, 37, 37, 10, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-@@ -11241,8 +7665,8 @@
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-- 0, 0, 10, 37, 37, 37, 37, 37, 37, 0,
-- 0, 37, 37, 37, 37, 37, 15, 37, 37, 37,
-+ 0, 0, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 0, 37, 37, 37, 37, 10, 10, 37, 37, 37,
- 37, 10, 37, 37, 37, 37, 37, 37,
- #endif /* ACE_MVS */
- };
-@@ -11250,49 +7674,47 @@
- }
-
- const class TAO_operation_db_entry *
--TAO_IR_ConstantDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+TAO_IR_EnumDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
+ class TAO_IR_ConstantDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
- enum
- {
-- TOTAL_KEYWORDS = 20,
-+ TOTAL_KEYWORDS = 18,
- MIN_WORD_LENGTH = 4,
- MAX_WORD_LENGTH = 26,
- MIN_HASH_VALUE = 4,
- MAX_HASH_VALUE = 36,
- HASH_VALUE_RANGE = 33,
-- DUPLICATES = 7
-+ DUPLICATES = 6
- };
-
- static const class TAO_operation_db_entry wordlist[] =
- {
- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::ConstantDef::move_skel},
-- {"_is_a", &POA_IR::ConstantDef::_is_a_skel},
-- {"_get_id", &POA_IR::ConstantDef::_get_id_skel},
-- {"_set_id", &POA_IR::ConstantDef::_set_id_skel},
-- {"describe", &POA_IR::ConstantDef::describe_skel},
-- {"_get_type", &POA_IR::ConstantDef::_get_type_skel},
-- {"_set_name", &POA_IR::ConstantDef::_set_name_skel},
-- {"_get_name", &POA_IR::ConstantDef::_get_name_skel},
-- {"_get_value", &POA_IR::ConstantDef::_get_value_skel},
-- {"_set_value", &POA_IR::ConstantDef::_set_value_skel},
-- {"_get_version", &POA_IR::ConstantDef::_get_version_skel},
-- {"_set_version", &POA_IR::ConstantDef::_set_version_skel},
-- {"_get_def_kind", &POA_IR::ConstantDef::_get_def_kind_skel},
-- {"_get_defined_in", &POA_IR::ConstantDef::_get_defined_in_skel},
-- {"destroy", &POA_IR::ConstantDef::destroy_skel},
-- {"_get_absolute_name", &POA_IR::ConstantDef::_get_absolute_name_skel},
-- {"_get_type_def", &POA_IR::ConstantDef::_get_type_def_skel},
-- {"_set_type_def", &POA_IR::ConstantDef::_set_type_def_skel},
-- {"_non_existent", &POA_IR::ConstantDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::ConstantDef::_get_containing_repository_skel},
-+ {"move", &POA_IR::EnumDef::move_skel},
-+ {"_is_a", &POA_IR::EnumDef::_is_a_skel},
-+ {"_get_id", &POA_IR::EnumDef::_get_id_skel},
-+ {"_set_id", &POA_IR::EnumDef::_set_id_skel},
-+ {"describe", &POA_IR::EnumDef::describe_skel},
-+ {"_get_name", &POA_IR::EnumDef::_get_name_skel},
-+ {"_get_type", &POA_IR::EnumDef::_get_type_skel},
-+ {"_set_name", &POA_IR::EnumDef::_set_name_skel},
-+ {"_get_version", &POA_IR::EnumDef::_get_version_skel},
-+ {"_set_version", &POA_IR::EnumDef::_set_version_skel},
-+ {"_get_def_kind", &POA_IR::EnumDef::_get_def_kind_skel},
-+ {"_get_defined_in", &POA_IR::EnumDef::_get_defined_in_skel},
-+ {"destroy", &POA_IR::EnumDef::destroy_skel},
-+ {"_get_absolute_name", &POA_IR::EnumDef::_get_absolute_name_skel},
-+ {"_get_members", &POA_IR::EnumDef::_get_members_skel},
-+ {"_set_members", &POA_IR::EnumDef::_set_members_skel},
-+ {"_non_existent", &POA_IR::EnumDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::EnumDef::_get_containing_repository_skel},
- };
-
- static const signed char lookup[] =
- {
-- -12, -2, -14, -2, 4, 5, -1, 53, 8, 46, -46, -1, -46, 16,
-- -1, 17, -1, 18, 19, -9, -3, -20, -2, -38, -6, -2, -1, -1,
-- 22, -1, -1, -1, -1, -1, -1, -1, 23,
-+ -6, -2, -9, -3, 4, 5, -1, -43, 8, -43, -12, -2, -38, 14,
-+ -1, 15, -1, 16, 17, -1, -18, -2, -38, 20, -1, -1, -1, -1,
-+ -1, -1, -1, -1, -1, -1, -1, -1, 21,
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -11326,38 +7748,37 @@
+ private:
+@@ -11193,7 +11171,7 @@
+ public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 18:47:27 */
++/* starting time is 11:23:09 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ConstantDef_Perfect_Hash_OpTable -N lookup */
+ unsigned int
+@@ -11324,10 +11302,9 @@
}
return 0;
}
--/* ending time is 16:31:12 */
--static TAO_IR_ConstantDef_Perfect_Hash_OpTable tao_IR_ConstantDef_optable;
--
-+/* ending time is 11:23:10 */
-+static TAO_IR_EnumDef_Perfect_Hash_OpTable tao_IR_EnumDef_optable;
+-/* ending time is 18:47:27 */
++/* ending time is 11:23:09 */
+ static TAO_IR_ConstantDef_Perfect_Hash_OpTable tao_IR_ConstantDef_optable;
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Implementation
//
-
- // Factory function Implementation.
--POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker *POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::the_TAO_ConstantDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker *POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::the_TAO_EnumDef_Strategized_Proxy_Broker (void)
- {
-- static POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ static POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker strategized_proxy_broker;
- return &strategized_proxy_broker;
- }
-
--POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::_TAO_ConstantDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::_TAO_EnumDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- this->proxy_cache_[i] = 0;
-
- }
-
--POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::~_TAO_ConstantDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::~_TAO_EnumDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- delete this->proxy_cache_[i];
+@@ -11353,9 +11330,9 @@
}
-IR::_TAO_ConstantDef_Proxy_Impl&
--POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::select_proxy (
++_TAO_ConstantDef_Proxy_Impl&
+ POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::select_proxy (
- ::IR::ConstantDef *object,
-+_TAO_EnumDef_Proxy_Impl&
-+POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::select_proxy (
-+ IR_EnumDef *object,
++ IR_ConstantDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -11375,7 +7796,7 @@
- }
-
- void
--POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::create_proxy (
-+POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::create_proxy (
- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -11389,7 +7810,7 @@
+@@ -11387,7 +11364,7 @@
case TAO_ORB_Core::THRU_POA_STRATEGY:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
- POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl,
-+ _TAO_EnumDef_ThruPOA_Proxy_Impl,
++ _TAO_ConstantDef_ThruPOA_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -11399,7 +7820,7 @@
+@@ -11397,7 +11374,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
- ::IR::_TAO_ConstantDef_Remote_Proxy_Impl,
-+ _TAO_EnumDef_Remote_Proxy_Impl,
++ _TAO_ConstantDef_Remote_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -11416,38 +7837,41 @@
+@@ -11414,26 +11391,26 @@
///////////////////////////////////////////////////////////////////////
-IR::_TAO_ConstantDef_Proxy_Broker *
-IR__TAO_ConstantDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_EnumDef_Proxy_Broker *
-+_TAO_EnumDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
++_TAO_ConstantDef_Proxy_Broker *
++_TAO_ConstantDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::the_TAO_ConstantDef_Strategized_Proxy_Broker();
-+ return ::POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::the_TAO_EnumDef_Strategized_Proxy_Broker();
+ return ::POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::the_TAO_ConstantDef_Strategized_Proxy_Broker();
}
int
-IR__TAO_ConstantDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_EnumDef_Proxy_Broker_Factory_Initializer (long _dummy_)
++_TAO_ConstantDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
ACE_UNUSED_ARG (_dummy_);
- IR__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer =
- IR__TAO_ConstantDef_Proxy_Broker_Factory_function;
-+ _TAO_EnumDef_Proxy_Broker_Factory_function_pointer =
-+ _TAO_EnumDef_Proxy_Broker_Factory_function;
++ _TAO_ConstantDef_Proxy_Broker_Factory_function_pointer =
++ _TAO_ConstantDef_Proxy_Broker_Factory_function;
return 0;
}
-static int IR__TAO_ConstantDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- IR__TAO_ConstantDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ConstantDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_EnumDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-+ _TAO_EnumDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_EnumDef_Proxy_Broker_Factory_Initializer));
++static int _TAO_ConstantDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
++ _TAO_ConstantDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ConstantDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
- // ThruPOA Proxy Implementation
- //
-
--POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_TAO_ConstantDef_ThruPOA_Proxy_Impl (void)
-+POA_IR::_TAO_EnumDef_ThruPOA_Proxy_Impl::_TAO_EnumDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_EnumDef_ThruPOA_Proxy_Impl::~_TAO_EnumDef_ThruPOA_Proxy_Impl (void)
- {}
-
- // ThruPOA Implementation of the IDL interface methods
+@@ -11476,7 +11453,7 @@
+ );
+ }
--CORBA::TypeCode_ptr POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type (
-+IR::EnumMemberSeq * POA_IR::_TAO_EnumDef_ThruPOA_Proxy_Impl::members (
+-IR::IDLType_ptr POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type_def (
++IR_IDLType_ptr POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type_def (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -11455,7 +7879,7 @@
+@@ -11484,7 +11461,7 @@
CORBA::SystemException
))
{
-- CORBA::TypeCode_var _tao_retval;
-+ IR_EnumMemberSeq_var _tao_retval;
+- IR::IDLType_var _tao_retval;
++ IR_IDLType_var _tao_retval;
ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -11463,145 +7887,51 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "type",
-+ "members",
- forward_to.out (),
- ACE_TRY_ENV
- );
- ACE_CHECK_RETURN (0);
- return ACE_reinterpret_cast (
-- POA_IR::ConstantDef_ptr,
-+ POA_IR::EnumDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ConstantDef:1.0"
-+ "IDL:omg.org/IR/EnumDef:1.0"
- )
-- )->type (
-+ )->members (
- ACE_TRY_ENV
- );
- }
+@@ -11509,7 +11486,7 @@
--IR::IDLType_ptr POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type_def (
-+void POA_IR::_TAO_EnumDef_ThruPOA_Proxy_Impl::members (
+ void POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type_def (
CORBA_Object *_collocated_tao_target_,
-+ const IR_EnumMemberSeq & members,
+- IR::IDLType_ptr type_def,
++ IR_IDLType_ptr type_def,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
- CORBA::SystemException
- ))
- {
-- IR::IDLType_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
- TAO_Object_Adapter::Servant_Upcall servant_upcall (
- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "type_def",
-+ "members",
- forward_to.out (),
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ConstantDef_ptr,
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::EnumDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ConstantDef:1.0"
-+ "IDL:omg.org/IR/EnumDef:1.0"
- )
-- )->type_def (
-+ )->members (
-+ members,
- ACE_TRY_ENV
- );
--}
--
--void POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type_def (
-- CORBA_Object *_collocated_tao_target_,
-- IR::IDLType_ptr type_def,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "type_def",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::ConstantDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ConstantDef:1.0"
-- )
-- )->type_def (
-- type_def,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
--CORBA::Any * POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::value (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- CORBA::Any_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "value",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ConstantDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ConstantDef:1.0"
-- )
-- )->value (
-- ACE_TRY_ENV
-- );
--}
--
--void POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::value (
-- CORBA_Object *_collocated_tao_target_,
-- const CORBA::Any & value,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "value",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::ConstantDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ConstantDef:1.0"
-- )
-- )->value (
-- value,
-- ACE_TRY_ENV
-- );
-- return;
-+ return;
- }
-
- //
-@@ -11609,466 +7939,126 @@
- ///////////////////////////////////////////////////////////////////////
-
- // skeleton constructor
--POA_IR::ConstantDef::ConstantDef (void)
-+POA_IR::EnumDef::EnumDef (void)
- {
-- this->optable_ = &tao_IR_ConstantDef_optable;
-+ this->optable_ = &tao_IR_EnumDef_optable;
- }
-
+@@ -11615,7 +11592,7 @@
// copy ctor
--POA_IR::ConstantDef::ConstantDef (const ConstantDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ POA_IR::ConstantDef::ConstantDef (const ConstantDef& rhs)
+ : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+POA_IR::EnumDef::EnumDef (const EnumDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,TypedefDef) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+ POA_CORBA_IRObject (rhs),
TAO_ServantBase (rhs)
{}
- // skeleton destructor
--POA_IR::ConstantDef::~ConstantDef (void)
-+POA_IR::EnumDef::~EnumDef (void)
+@@ -11713,7 +11690,7 @@
{
- }
-
--void POA_IR::ConstantDef::_get_type_skel (
-+void POA_IR::EnumDef::_get_members_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *)_tao_object_reference;
-+ POA_IR::EnumDef *_tao_impl = (POA_IR::EnumDef *)_tao_object_reference;
-
-- CORBA::TypeCode_var _tao_retval;
-+ IR_EnumMemberSeq_var _tao_retval;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->members (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->type (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::ConstantDef::_get_type_def_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *)_tao_object_reference;
-
-- IR::IDLType_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->type_def (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
- (_tao_out << _tao_retval.in ())
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
+ POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *)_tao_object_reference;
+
+- IR::IDLType_var _tao_retval;
++ IR_IDLType_var _tao_retval;
--void POA_IR::ConstantDef::_set_type_def_skel (
-+void POA_IR::EnumDef::_set_members_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -11740,7 +11717,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -11794,14 +11771,12 @@
TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *)_tao_object_reference;
-+ POA_IR::EnumDef *_tao_impl = (POA_IR::EnumDef *)_tao_object_reference;
-
--_tao_server_request.argument_flag (0);
+ POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
- IR::IDLType_var type_def;
-+ IR_EnumMemberSeq members;
++ IR_IDLType_var type_def;
if (!(
-- (_tao_in >> type_def.out ())
-+ (_tao_in >> members)
+ (_tao_in >> type_def.out ())
))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- type_def.in (),
-+ _tao_impl->members (
-+ members,
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->type_def (
-- type_def.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::ConstantDef::_get_value_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *)_tao_object_reference;
--
-- CORBA::Any_var _tao_retval;
+ ACE_THROW (CORBA::MARSHAL());
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
-
-- _tao_impl->value (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::Any * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-
-+ _tao_server_request.init_reply ();
- }
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -11953,14 +11928,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+ CORBA::Any value;
+ if (!(
+ (_tao_in >> value)
+ ))
+ ACE_THROW (CORBA::MARSHAL());
--void POA_IR::ConstantDef::_set_value_skel (
-+void POA_IR::EnumDef::_is_a_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- CORBA::Any value;
-- if (!(
-- (_tao_in >> value)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- value,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-
-- _tao_impl->value (
-- value,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::ConstantDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *) _tao_object_reference;
-+ POA_IR::EnumDef *_tao_impl = (POA_IR::EnumDef *) _tao_object_reference;
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -12033,7 +12006,7 @@
+ POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *) _tao_object_reference;
CORBA::Boolean _tao_retval = 0;
CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
ACE_THROW (CORBA::MARSHAL ());
--
-+
+
_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -12041,7 +12014,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -15880,21 +3134,8 @@
ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::ConstantDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::EnumDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *) _tao_object_reference;
-+ POA_IR::EnumDef *_tao_impl = (POA_IR::EnumDef *) _tao_object_reference;
- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -12058,7 +12031,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -15902,871 +3143,149 @@
ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Boolean POA_IR::ConstantDef::_is_a (
-+CORBA::Boolean POA_IR::EnumDef::_is_a (
- const 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/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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
- return 1;
-@@ -12076,33 +8066,37 @@
- return 0;
- }
-
--void* POA_IR::ConstantDef::_downcast (
-+void* POA_IR::EnumDef::_downcast (
- const char* logical_type_id
- )
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ConstantDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::ConstantDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/EnumDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::EnumDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/TypedefDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::TypedefDef_ptr, this);
+@@ -12086,7 +12059,7 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
return ACE_static_cast (POA_IR::Contained_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-+ return ACE_static_cast (POA_IR::IDLType_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
- }
-
--void POA_IR::ConstantDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::EnumDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--const char* POA_IR::ConstantDef::_interface_repository_id (void) const
-+const char* POA_IR::EnumDef::_interface_repository_id (void) const
- {
-- return "IDL:omg.org/IR/ConstantDef:1.0";
-+ return "IDL:omg.org/IR/EnumDef:1.0";
- }
-
--IR::ConstantDef*
--POA_IR::ConstantDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+IR::EnumDef*
-+POA_IR::EnumDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-@@ -12115,401 +8109,21 @@
+@@ -12116,10 +12089,9 @@
ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
CORBA::Object_var obj = tmp;
- return ::IR::ConstantDef::_unchecked_narrow (obj.in ());
--}
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::TAO_ServerRequestInfo_IR_ConstantDef_type_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ConstantDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::result (CORBA::TypeCode_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ConstantDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get::result (IR::IDLType_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
++ return IR_ConstantDef::_unchecked_narrow (obj.in ());
+ }
+
-
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ConstantDef *tao_impl
-- ,
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::TAO_ServerRequestInfo_IR_ConstantDef_type_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -12274,7 +12246,7 @@
+ POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::ConstantDef *tao_impl,
- IR::IDLType_ptr type_def,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- type_def_ (type_def)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_type_def = parameter_list->length ();
-- parameter_list->length (length_type_def + 1);
-- (*parameter_list)[length_type_def].argument <<= this->type_def_;
--
-- (*parameter_list)[length_type_def].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get::TAO_ServerRequestInfo_IR_ConstantDef_value_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ConstantDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get::result (CORBA::Any * result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_set::TAO_ServerRequestInfo_IR_ConstantDef_value_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ConstantDef *tao_impl
-- ,
-- const CORBA::Any & value,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- value_ (value)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_value = parameter_list->length ();
-- parameter_list->length (length_value + 1);
-- (*parameter_list)[length_value].argument <<= value_;
-- (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ return IR_EnumDef::_unchecked_narrow (obj.in ());
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -12494,6 +12466,7 @@
}
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_TypedefDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+class TAO_IR_AliasDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_TypedefDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
private:
- unsigned int hash (const char *str, unsigned int len);
+@@ -12501,7 +12474,7 @@
public:
const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
};
--/* starting time is 16:31:12 */
-+/* starting time is 11:23:10 */
+-/* starting time is 18:47:27 */
++/* starting time is 11:23:09 */
/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_TypedefDef_Perfect_Hash_OpTable -N lookup */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_AliasDef_Perfect_Hash_OpTable -N lookup */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_TypedefDef_Perfect_Hash_OpTable -N lookup */
unsigned int
--TAO_IR_TypedefDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+TAO_IR_AliasDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
- static const unsigned char asso_values[] =
- {
-@@ -12527,7 +8141,7 @@
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 0, 0, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 0, 0, 0, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
-@@ -12551,7 +8165,7 @@
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-- 0, 0, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 0, 0, 0, 37, 37, 37, 37, 37, 37, 0,
- 0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
- 37, 10, 37, 37, 37, 37, 37, 37,
- #endif /* ACE_MVS */
-@@ -12560,45 +8174,47 @@
- }
-
- const class TAO_operation_db_entry *
--TAO_IR_TypedefDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+TAO_IR_AliasDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
- enum
- {
-- TOTAL_KEYWORDS = 16,
-+ TOTAL_KEYWORDS = 18,
- MIN_WORD_LENGTH = 4,
- MAX_WORD_LENGTH = 26,
- MIN_HASH_VALUE = 4,
- MAX_HASH_VALUE = 36,
- HASH_VALUE_RANGE = 33,
-- DUPLICATES = 5
-+ DUPLICATES = 6
- };
-
- static const class TAO_operation_db_entry wordlist[] =
- {
- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::TypedefDef::move_skel},
-- {"_is_a", &POA_IR::TypedefDef::_is_a_skel},
-- {"_get_id", &POA_IR::TypedefDef::_get_id_skel},
-- {"_set_id", &POA_IR::TypedefDef::_set_id_skel},
-- {"describe", &POA_IR::TypedefDef::describe_skel},
-- {"_get_name", &POA_IR::TypedefDef::_get_name_skel},
-- {"_get_type", &POA_IR::TypedefDef::_get_type_skel},
-- {"_set_name", &POA_IR::TypedefDef::_set_name_skel},
-- {"_get_version", &POA_IR::TypedefDef::_get_version_skel},
-- {"_set_version", &POA_IR::TypedefDef::_set_version_skel},
-- {"_get_def_kind", &POA_IR::TypedefDef::_get_def_kind_skel},
-- {"_get_defined_in", &POA_IR::TypedefDef::_get_defined_in_skel},
-- {"destroy", &POA_IR::TypedefDef::destroy_skel},
-- {"_get_absolute_name", &POA_IR::TypedefDef::_get_absolute_name_skel},
-- {"_non_existent", &POA_IR::TypedefDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::TypedefDef::_get_containing_repository_skel},
-+ {"move", &POA_IR::AliasDef::move_skel},
-+ {"_is_a", &POA_IR::AliasDef::_is_a_skel},
-+ {"_get_id", &POA_IR::AliasDef::_get_id_skel},
-+ {"_set_id", &POA_IR::AliasDef::_set_id_skel},
-+ {"describe", &POA_IR::AliasDef::describe_skel},
-+ {"_get_name", &POA_IR::AliasDef::_get_name_skel},
-+ {"_get_type", &POA_IR::AliasDef::_get_type_skel},
-+ {"_set_name", &POA_IR::AliasDef::_set_name_skel},
-+ {"_get_version", &POA_IR::AliasDef::_get_version_skel},
-+ {"_set_version", &POA_IR::AliasDef::_set_version_skel},
-+ {"_get_def_kind", &POA_IR::AliasDef::_get_def_kind_skel},
-+ {"_get_defined_in", &POA_IR::AliasDef::_get_defined_in_skel},
-+ {"destroy", &POA_IR::AliasDef::destroy_skel},
-+ {"_get_absolute_name", &POA_IR::AliasDef::_get_absolute_name_skel},
-+ {"_get_original_type_def", &POA_IR::AliasDef::_get_original_type_def_skel},
-+ {"_set_original_type_def", &POA_IR::AliasDef::_set_original_type_def_skel},
-+ {"_non_existent", &POA_IR::AliasDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::AliasDef::_get_containing_repository_skel},
- };
-
- static const signed char lookup[] =
- {
-- -6, -2, -9, -3, 4, 5, -1, -43, 8, -43, -12, -2, -38, 14,
-- -1, 15, -1, 16, 17, -1, -1, -1, -1, 18, -1, -1, -1, -1,
-- -1, -1, -1, -1, -1, -1, -1, -1, 19,
-+ -6, -2, -9, -3, 4, 5, -1, -43, 8, -43, -12, -2, -38, 14,
-+ -1, 15, -1, 16, 17, -1, -18, -2, -38, 20, -1, -1, -1, -1,
-+ -1, -1, -1, -1, -1, -1, -1, -1, 21,
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -12632,38 +8248,37 @@
+@@ -12628,10 +12601,9 @@
}
return 0;
}
--/* ending time is 16:31:12 */
--static TAO_IR_TypedefDef_Perfect_Hash_OpTable tao_IR_TypedefDef_optable;
--
-+/* ending time is 11:23:10 */
-+static TAO_IR_AliasDef_Perfect_Hash_OpTable tao_IR_AliasDef_optable;
+-/* ending time is 18:47:27 */
++/* ending time is 11:23:09 */
+ static TAO_IR_TypedefDef_Perfect_Hash_OpTable tao_IR_TypedefDef_optable;
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Implementation
//
-
- // Factory function Implementation.
--POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker *POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::the_TAO_TypedefDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker *POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::the_TAO_AliasDef_Strategized_Proxy_Broker (void)
- {
-- static POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ static POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker strategized_proxy_broker;
- return &strategized_proxy_broker;
- }
-
--POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::_TAO_TypedefDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::_TAO_AliasDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- this->proxy_cache_[i] = 0;
-
- }
-
--POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::~_TAO_TypedefDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::~_TAO_AliasDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- delete this->proxy_cache_[i];
+@@ -12657,9 +12629,9 @@
}
-IR::_TAO_TypedefDef_Proxy_Impl&
--POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::select_proxy (
++_TAO_TypedefDef_Proxy_Impl&
+ POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::select_proxy (
- ::IR::TypedefDef *object,
-+_TAO_AliasDef_Proxy_Impl&
-+POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::select_proxy (
-+ IR_AliasDef *object,
++ IR_TypedefDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -12681,7 +8296,7 @@
- }
-
- void
--POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::create_proxy (
-+POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::create_proxy (
- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -12695,7 +8310,7 @@
+@@ -12691,7 +12663,7 @@
case TAO_ORB_Core::THRU_POA_STRATEGY:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
- POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl,
-+ _TAO_AliasDef_ThruPOA_Proxy_Impl,
++ _TAO_TypedefDef_ThruPOA_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -12705,7 +8320,7 @@
+@@ -12701,7 +12673,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
- ::IR::_TAO_TypedefDef_Remote_Proxy_Impl,
-+ _TAO_AliasDef_Remote_Proxy_Impl,
++ _TAO_TypedefDef_Remote_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -12722,106 +8337,225 @@
+@@ -12718,26 +12690,26 @@
///////////////////////////////////////////////////////////////////////
-IR::_TAO_TypedefDef_Proxy_Broker *
-IR__TAO_TypedefDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_AliasDef_Proxy_Broker *
-+_TAO_AliasDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
++_TAO_TypedefDef_Proxy_Broker *
++_TAO_TypedefDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::the_TAO_TypedefDef_Strategized_Proxy_Broker();
-+ return ::POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::the_TAO_AliasDef_Strategized_Proxy_Broker();
+ return ::POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::the_TAO_TypedefDef_Strategized_Proxy_Broker();
}
int
-IR__TAO_TypedefDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_AliasDef_Proxy_Broker_Factory_Initializer (long _dummy_)
++_TAO_TypedefDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
ACE_UNUSED_ARG (_dummy_);
- IR__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer =
- IR__TAO_TypedefDef_Proxy_Broker_Factory_function;
-+ _TAO_AliasDef_Proxy_Broker_Factory_function_pointer =
-+ _TAO_AliasDef_Proxy_Broker_Factory_function;
++ _TAO_TypedefDef_Proxy_Broker_Factory_function_pointer =
++ _TAO_TypedefDef_Proxy_Broker_Factory_function;
return 0;
}
-static int IR__TAO_TypedefDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- IR__TAO_TypedefDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_TypedefDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_AliasDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-+ _TAO_AliasDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_AliasDef_Proxy_Broker_Factory_Initializer));
++static int _TAO_TypedefDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
++ _TAO_TypedefDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_TypedefDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
- // ThruPOA Proxy Implementation
- //
-
--POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl::_TAO_TypedefDef_ThruPOA_Proxy_Impl (void)
-+POA_IR::_TAO_AliasDef_ThruPOA_Proxy_Impl::_TAO_AliasDef_ThruPOA_Proxy_Impl (void)
- {}
-
--// ThruPOA Implementation of the IDL interface methods
--
--//
--// End ThruPOA Proxy Implementation
--///////////////////////////////////////////////////////////////////////
--
--// skeleton constructor
--POA_IR::TypedefDef::TypedefDef (void)
--{
-- this->optable_ = &tao_IR_TypedefDef_optable;
--}
--
--// copy ctor
--POA_IR::TypedefDef::TypedefDef (const TypedefDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-- ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+@@ -12763,7 +12735,7 @@
+ POA_IR::TypedefDef::TypedefDef (const TypedefDef& rhs)
+ : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-- TAO_ServantBase (rhs)
-+POA_IR::_TAO_AliasDef_ThruPOA_Proxy_Impl::~_TAO_AliasDef_ThruPOA_Proxy_Impl (void)
++ POA_CORBA_IRObject (rhs),
+ TAO_ServantBase (rhs)
{}
--// skeleton destructor
--POA_IR::TypedefDef::~TypedefDef (void)
-+// ThruPOA Implementation of the IDL interface methods
-+
-+IR::IDLType_ptr POA_IR::_TAO_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-+ IR_IDLType_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "original_type_def",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::AliasDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/AliasDef:1.0"
-+ )
-+ )->original_type_def (
-+ ACE_TRY_ENV
-+ );
- }
-
--void POA_IR::TypedefDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-+void POA_IR::_TAO_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
-+ CORBA_Object *_collocated_tao_target_,
-+ IR_IDLType_ptr original_type_def,
- CORBA::Environment &ACE_TRY_ENV
- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::TypedefDef *_tao_impl = (POA_IR::TypedefDef *) _tao_object_reference;
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "original_type_def",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::AliasDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/AliasDef:1.0"
-+ )
-+ )->original_type_def (
-+ original_type_def,
-+ ACE_TRY_ENV
-+ );
-+ return;
-+}
-+
-+//
-+// End ThruPOA Proxy Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-+// skeleton constructor
-+POA_IR::AliasDef::AliasDef (void)
-+{
-+ this->optable_ = &tao_IR_AliasDef_optable;
-+}
-+
-+// copy ctor
-+POA_IR::AliasDef::AliasDef (const AliasDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,TypedefDef) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
-+ POA_CORBA_IRObject (rhs),
-+ TAO_ServantBase (rhs)
-+{}
-+
-+// skeleton destructor
-+POA_IR::AliasDef::~AliasDef (void)
-+{
-+}
-+
-+void POA_IR::AliasDef::_get_original_type_def_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ POA_IR::AliasDef *_tao_impl = (POA_IR::AliasDef *)_tao_object_reference;
-+
-+ IR_IDLType_var _tao_retval;
-+
-+ _tao_retval = _tao_impl->original_type_def (
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+}
-+
-+void POA_IR::AliasDef::_set_original_type_def_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::AliasDef *_tao_impl = (POA_IR::AliasDef *)_tao_object_reference;
-+
-+ IR_IDLType_var original_type_def;
-+ if (!(
-+ (_tao_in >> original_type_def.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_impl->original_type_def (
-+ original_type_def.in (),
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+}
-+
-+void POA_IR::AliasDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+{
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::AliasDef *_tao_impl = (POA_IR::AliasDef *) _tao_object_reference;
+@@ -12783,7 +12755,7 @@
+ POA_IR::TypedefDef *_tao_impl = (POA_IR::TypedefDef *) _tao_object_reference;
CORBA::Boolean _tao_retval = 0;
CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
ACE_THROW (CORBA::MARSHAL ());
--
-+
+
_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -12791,7 +12763,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -16774,21 +3293,8 @@
ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::TypedefDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::AliasDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::TypedefDef *_tao_impl = (POA_IR::TypedefDef *) _tao_object_reference;
-+ POA_IR::AliasDef *_tao_impl = (POA_IR::AliasDef *) _tao_object_reference;
- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -12808,7 +12780,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -16796,32 +3302,7 @@
ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Boolean POA_IR::TypedefDef::_is_a (
-+CORBA::Boolean POA_IR::AliasDef::_is_a (
- const 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")) ||
-@@ -12832,10 +8566,12 @@
- return 0;
- }
-
--void* POA_IR::TypedefDef::_downcast (
-+void* POA_IR::AliasDef::_downcast (
- const char* logical_type_id
- )
- {
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/AliasDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::AliasDef_ptr, this);
- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/TypedefDef:1.0") == 0)
- return ACE_static_cast (POA_IR::TypedefDef_ptr, this);
- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-@@ -12843,24 +8579,24 @@
+@@ -12839,7 +12811,7 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
return ACE_static_cast (POA_IR::IDLType_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
@@ -16830,432 +3311,135 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
- }
-
--void POA_IR::TypedefDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::AliasDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--const char* POA_IR::TypedefDef::_interface_repository_id (void) const
-+const char* POA_IR::AliasDef::_interface_repository_id (void) const
- {
-- return "IDL:omg.org/IR/TypedefDef:1.0";
-+ return "IDL:omg.org/IR/AliasDef:1.0";
- }
-
--IR::TypedefDef*
--POA_IR::TypedefDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+IR::AliasDef*
-+POA_IR::AliasDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-@@ -12873,131 +8609,110 @@
+@@ -12869,12 +12841,12 @@
ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
CORBA::Object_var obj = tmp;
- return ::IR::TypedefDef::_unchecked_narrow (obj.in ());
-+ return IR_AliasDef::_unchecked_narrow (obj.in ());
++ return IR_TypedefDef::_unchecked_narrow (obj.in ());
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_StructDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+class TAO_IR_NativeDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_StructDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
private:
- unsigned int hash (const char *str, unsigned int len);
+@@ -12882,7 +12854,7 @@
public:
const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
};
--/* starting time is 16:31:12 */
-+/* starting time is 11:23:10 */
+-/* starting time is 18:47:27 */
++/* starting time is 11:23:09 */
/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_StructDef_Perfect_Hash_OpTable -N lookup */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_NativeDef_Perfect_Hash_OpTable -N lookup */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_StructDef_Perfect_Hash_OpTable -N lookup */
unsigned int
--TAO_IR_StructDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+TAO_IR_NativeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
- static const unsigned char asso_values[] =
- {
- #if defined (ACE_MVS)
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 0,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 0,
-- 52, 20, 3, 0, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 10, 15, 5,
-- 52, 10, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 15, 15, 52, 52, 52, 15, 5, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 0, 0, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37,
- #else
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 0, 52, 0, 52, 20,
-- 3, 0, 52, 52, 52, 52, 52, 52, 10, 15,
-- 5, 52, 10, 52, 52, 15, 15, 52, 52, 52,
-- 15, 5, 52, 52, 52, 52, 52, 52,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-+ 0, 0, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
-+ 37, 10, 37, 37, 37, 37, 37, 37,
- #endif /* ACE_MVS */
- };
- return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
- const class TAO_operation_db_entry *
--TAO_IR_StructDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+TAO_IR_NativeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
- enum
- {
-- TOTAL_KEYWORDS = 33,
-+ TOTAL_KEYWORDS = 16,
- MIN_WORD_LENGTH = 4,
- MAX_WORD_LENGTH = 26,
-- MIN_HASH_VALUE = 5,
-- MAX_HASH_VALUE = 51,
-- HASH_VALUE_RANGE = 47,
-- DUPLICATES = 7
-+ MIN_HASH_VALUE = 4,
-+ MAX_HASH_VALUE = 36,
-+ HASH_VALUE_RANGE = 33,
-+ DUPLICATES = 5
- };
-
- static const class TAO_operation_db_entry wordlist[] =
- {
-- {"",0},{"",0},{"",0},{"",0},{"",0},
-- {"_is_a", &POA_IR::StructDef::_is_a_skel},
-- {"_get_name", &POA_IR::StructDef::_get_name_skel},
-- {"_get_type", &POA_IR::StructDef::_get_type_skel},
-- {"_set_name", &POA_IR::StructDef::_set_name_skel},
-- {"_get_id", &POA_IR::StructDef::_get_id_skel},
-- {"_set_id", &POA_IR::StructDef::_set_id_skel},
-- {"describe", &POA_IR::StructDef::describe_skel},
-- {"destroy", &POA_IR::StructDef::destroy_skel},
-- {"_get_def_kind", &POA_IR::StructDef::_get_def_kind_skel},
-- {"_get_version", &POA_IR::StructDef::_get_version_skel},
-- {"_set_version", &POA_IR::StructDef::_set_version_skel},
-- {"_get_absolute_name", &POA_IR::StructDef::_get_absolute_name_skel},
-- {"move", &POA_IR::StructDef::move_skel},
-- {"_get_defined_in", &POA_IR::StructDef::_get_defined_in_skel},
-- {"lookup_name", &POA_IR::StructDef::lookup_name_skel},
-- {"lookup", &POA_IR::StructDef::lookup_skel},
-- {"_get_members", &POA_IR::StructDef::_get_members_skel},
-- {"_set_members", &POA_IR::StructDef::_set_members_skel},
-- {"_non_existent", &POA_IR::StructDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::StructDef::_get_containing_repository_skel},
-- {"create_value", &POA_IR::StructDef::create_value_skel},
-- {"create_module", &POA_IR::StructDef::create_module_skel},
-- {"create_native", &POA_IR::StructDef::create_native_skel},
-- {"describe_contents", &POA_IR::StructDef::describe_contents_skel},
-- {"create_interface", &POA_IR::StructDef::create_interface_skel},
-- {"create_union", &POA_IR::StructDef::create_union_skel},
-- {"create_exception", &POA_IR::StructDef::create_exception_skel},
-- {"contents", &POA_IR::StructDef::contents_skel},
-- {"create_enum", &POA_IR::StructDef::create_enum_skel},
-- {"create_alias", &POA_IR::StructDef::create_alias_skel},
-- {"create_struct", &POA_IR::StructDef::create_struct_skel},
-- {"create_constant", &POA_IR::StructDef::create_constant_skel},
-- {"create_value_box", &POA_IR::StructDef::create_value_box_skel},
-+ {"",0},{"",0},{"",0},{"",0},
-+ {"move", &POA_IR::NativeDef::move_skel},
-+ {"_is_a", &POA_IR::NativeDef::_is_a_skel},
-+ {"_get_id", &POA_IR::NativeDef::_get_id_skel},
-+ {"_set_id", &POA_IR::NativeDef::_set_id_skel},
-+ {"describe", &POA_IR::NativeDef::describe_skel},
-+ {"_get_name", &POA_IR::NativeDef::_get_name_skel},
-+ {"_get_type", &POA_IR::NativeDef::_get_type_skel},
-+ {"_set_name", &POA_IR::NativeDef::_set_name_skel},
-+ {"_get_version", &POA_IR::NativeDef::_get_version_skel},
-+ {"_set_version", &POA_IR::NativeDef::_set_version_skel},
-+ {"_get_def_kind", &POA_IR::NativeDef::_get_def_kind_skel},
-+ {"_get_defined_in", &POA_IR::NativeDef::_get_defined_in_skel},
-+ {"destroy", &POA_IR::NativeDef::destroy_skel},
-+ {"_get_absolute_name", &POA_IR::NativeDef::_get_absolute_name_skel},
-+ {"_non_existent", &POA_IR::NativeDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::NativeDef::_get_containing_repository_skel},
- };
-
- static const signed char lookup[] =
- {
-- -1, -1, -1, -6, -3, 5, -1, -9, -2, -57, -54, 11, -1, -14,
-- -2, 12, 13, -55, 16, 17, 18, 19, -1, -1, -21, -2, 20, -54,
-- 23, -26, -2, 24, 25, -55, -1, 28, 29, 30, -1, -1, -1, 31,
-- -1, 32, -1, -1, 33, 34, 35, -1, 36, 37,
-+ -6, -2, -9, -3, 4, 5, -1, -43, 8, -43, -12, -2, -38, 14,
-+ -1, 15, -1, 16, 17, -1, -1, -1, -1, 18, -1, -1, -1, -1,
-+ -1, -1, -1, -1, -1, -1, -1, -1, 19,
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -13031,38 +8746,37 @@
+@@ -13027,10 +12999,9 @@
}
return 0;
}
--/* ending time is 16:31:12 */
--static TAO_IR_StructDef_Perfect_Hash_OpTable tao_IR_StructDef_optable;
--
-+/* ending time is 11:23:10 */
-+static TAO_IR_NativeDef_Perfect_Hash_OpTable tao_IR_NativeDef_optable;
+-/* ending time is 18:47:27 */
++/* ending time is 11:23:09 */
+ static TAO_IR_StructDef_Perfect_Hash_OpTable tao_IR_StructDef_optable;
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Implementation
//
-
- // Factory function Implementation.
--POA_IR::_TAO_StructDef_Strategized_Proxy_Broker *POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::the_TAO_StructDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker *POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::the_TAO_NativeDef_Strategized_Proxy_Broker (void)
- {
-- static POA_IR::_TAO_StructDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ static POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker strategized_proxy_broker;
- return &strategized_proxy_broker;
- }
-
--POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::_TAO_StructDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::_TAO_NativeDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- this->proxy_cache_[i] = 0;
-
- }
-
--POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::~_TAO_StructDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::~_TAO_NativeDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- delete this->proxy_cache_[i];
+@@ -13056,9 +13027,9 @@
}
-IR::_TAO_StructDef_Proxy_Impl&
--POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::select_proxy (
++_TAO_StructDef_Proxy_Impl&
+ POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::select_proxy (
- ::IR::StructDef *object,
-+_TAO_NativeDef_Proxy_Impl&
-+POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::select_proxy (
-+ IR_NativeDef *object,
++ IR_StructDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -13080,7 +8794,7 @@
- }
-
- void
--POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::create_proxy (
-+POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::create_proxy (
- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -13094,7 +8808,7 @@
+@@ -13090,7 +13061,7 @@
case TAO_ORB_Core::THRU_POA_STRATEGY:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
- POA_IR::_TAO_StructDef_ThruPOA_Proxy_Impl,
-+ _TAO_NativeDef_ThruPOA_Proxy_Impl,
++ _TAO_StructDef_ThruPOA_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -13104,7 +8818,7 @@
+@@ -13100,7 +13071,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
- ::IR::_TAO_StructDef_Remote_Proxy_Impl,
-+ _TAO_NativeDef_Remote_Proxy_Impl,
++ _TAO_StructDef_Remote_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -13121,332 +8835,112 @@
+@@ -13117,26 +13088,26 @@
///////////////////////////////////////////////////////////////////////
-IR::_TAO_StructDef_Proxy_Broker *
-IR__TAO_StructDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_NativeDef_Proxy_Broker *
-+_TAO_NativeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
++_TAO_StructDef_Proxy_Broker *
++_TAO_StructDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::the_TAO_StructDef_Strategized_Proxy_Broker();
-+ return ::POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::the_TAO_NativeDef_Strategized_Proxy_Broker();
+ return ::POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::the_TAO_StructDef_Strategized_Proxy_Broker();
}
int
-IR__TAO_StructDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_NativeDef_Proxy_Broker_Factory_Initializer (long _dummy_)
++_TAO_StructDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
ACE_UNUSED_ARG (_dummy_);
- IR__TAO_StructDef_Proxy_Broker_Factory_function_pointer =
- IR__TAO_StructDef_Proxy_Broker_Factory_function;
-+ _TAO_NativeDef_Proxy_Broker_Factory_function_pointer =
-+ _TAO_NativeDef_Proxy_Broker_Factory_function;
++ _TAO_StructDef_Proxy_Broker_Factory_function_pointer =
++ _TAO_StructDef_Proxy_Broker_Factory_function;
return 0;
}
-static int IR__TAO_StructDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- IR__TAO_StructDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_StructDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_NativeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-+ _TAO_NativeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_NativeDef_Proxy_Broker_Factory_Initializer));
++static int _TAO_StructDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
++ _TAO_StructDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_StructDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
- // ThruPOA Proxy Implementation
- //
-
--POA_IR::_TAO_StructDef_ThruPOA_Proxy_Impl::_TAO_StructDef_ThruPOA_Proxy_Impl (void)
-+POA_IR::_TAO_NativeDef_ThruPOA_Proxy_Impl::_TAO_NativeDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_NativeDef_ThruPOA_Proxy_Impl::~_TAO_NativeDef_ThruPOA_Proxy_Impl (void)
- {}
+@@ -13148,7 +13119,7 @@
// ThruPOA Implementation of the IDL interface methods
-IR::StructMemberSeq * POA_IR::_TAO_StructDef_ThruPOA_Proxy_Impl::members (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- IR::StructMemberSeq_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "members",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::StructDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/StructDef:1.0"
-- )
-- )->members (
-- ACE_TRY_ENV
-- );
--}
--
--void POA_IR::_TAO_StructDef_ThruPOA_Proxy_Impl::members (
-- CORBA_Object *_collocated_tao_target_,
-- const IR::StructMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "members",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::StructDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/StructDef:1.0"
-- )
-- )->members (
-- members,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
- //
- // End ThruPOA Proxy Implementation
- ///////////////////////////////////////////////////////////////////////
-
- // skeleton constructor
--POA_IR::StructDef::StructDef (void)
-+POA_IR::NativeDef::NativeDef (void)
++IR_StructMemberSeq * POA_IR::_TAO_StructDef_ThruPOA_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -13156,7 +13127,7 @@
+ CORBA::SystemException
+ ))
{
-- this->optable_ = &tao_IR_StructDef_optable;
-+ this->optable_ = &tao_IR_NativeDef_optable;
- }
+- IR::StructMemberSeq_var _tao_retval;
++ IR_StructMemberSeq_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -13181,7 +13152,7 @@
- // copy ctor
--POA_IR::StructDef::StructDef (const StructDef& rhs)
-+POA_IR::NativeDef::NativeDef (const NativeDef& rhs)
- : ACE_NESTED_CLASS (POA_IR,TypedefDef) (rhs),
-- ACE_NESTED_CLASS (POA_IR,Container) (rhs),
+ void POA_IR::_TAO_StructDef_ThruPOA_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::StructMemberSeq & members,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -13227,7 +13198,7 @@
+ ACE_NESTED_CLASS (POA_IR,Container) (rhs),
ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
@@ -17263,192 +3447,51 @@
TAO_ServantBase (rhs)
{}
- // skeleton destructor
--POA_IR::StructDef::~StructDef (void)
--{
--}
--
--void POA_IR::StructDef::_get_members_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-+POA_IR::NativeDef::~NativeDef (void)
- {
-- POA_IR::StructDef *_tao_impl = (POA_IR::StructDef *)_tao_object_reference;
--
-- IR::StructMemberSeq_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->members (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::StructMemberSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
- }
+@@ -13245,7 +13216,7 @@
+ {
+ POA_IR::StructDef *_tao_impl = (POA_IR::StructDef *)_tao_object_reference;
+
+- IR::StructMemberSeq_var _tao_retval;
++ IR_StructMemberSeq_var _tao_retval;
--void POA_IR::StructDef::_set_members_skel (
-+void POA_IR::NativeDef::_is_a_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::StructDef *_tao_impl = (POA_IR::StructDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -13272,7 +13243,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::StructMemberSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_StructMemberSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -13326,14 +13297,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::StructDef *_tao_impl = (POA_IR::StructDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
- IR::StructMemberSeq members;
-- if (!(
-- (_tao_in >> members)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- members,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->members (
-- members,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
++ IR_StructMemberSeq members;
+ if (!(
+ (_tao_in >> members)
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
-
--void POA_IR::StructDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::StructDef *_tao_impl = (POA_IR::StructDef *) _tao_object_reference;
-+ POA_IR::NativeDef *_tao_impl = (POA_IR::NativeDef *) _tao_object_reference;
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -13406,7 +13375,7 @@
+ POA_IR::StructDef *_tao_impl = (POA_IR::StructDef *) _tao_object_reference;
CORBA::Boolean _tao_retval = 0;
CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
ACE_THROW (CORBA::MARSHAL ());
--
-+
+
_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -13414,7 +13383,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -17456,21 +3499,8 @@
ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::StructDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::NativeDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::StructDef *_tao_impl = (POA_IR::StructDef *) _tao_object_reference;
-+ POA_IR::NativeDef *_tao_impl = (POA_IR::NativeDef *) _tao_object_reference;
- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -13431,7 +13400,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -17478,39 +3508,7 @@
ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Boolean POA_IR::StructDef::_is_a (
-+CORBA::Boolean POA_IR::NativeDef::_is_a (
- const 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/NativeDef: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")) ||
-@@ -13456,39 +8950,37 @@
- return 0;
- }
-
--void* POA_IR::StructDef::_downcast (
-+void* POA_IR::NativeDef::_downcast (
- const char* logical_type_id
- )
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/StructDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::StructDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/NativeDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::NativeDef_ptr, this);
- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/TypedefDef:1.0") == 0)
- return ACE_static_cast (POA_IR::TypedefDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-- return ACE_static_cast (POA_IR::Container_ptr, this);
- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
- return ACE_static_cast (POA_IR::Contained_ptr, this);
+@@ -13468,7 +13437,7 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
return ACE_static_cast (POA_IR::IDLType_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
@@ -17519,1172 +3517,262 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
- }
-
--void POA_IR::StructDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::NativeDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--const char* POA_IR::StructDef::_interface_repository_id (void) const
-+const char* POA_IR::NativeDef::_interface_repository_id (void) const
- {
-- return "IDL:omg.org/IR/StructDef:1.0";
-+ return "IDL:omg.org/IR/NativeDef:1.0";
- }
-
--IR::StructDef*
--POA_IR::StructDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+IR::NativeDef*
-+POA_IR::NativeDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-@@ -13501,286 +8993,97 @@
+@@ -13498,10 +13467,9 @@
ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
CORBA::Object_var obj = tmp;
- return ::IR::StructDef::_unchecked_narrow (obj.in ());
--}
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::TAO_ServerRequestInfo_IR_StructDef_members_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::StructDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::result (IR::StructMemberSeq * result)
--{
-- // Update the result.
-- this->_result = result;
--}
++ return IR_StructDef::_unchecked_narrow (obj.in ());
+ }
+
-
--POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_set::TAO_ServerRequestInfo_IR_StructDef_members_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::StructDef *tao_impl
-- ,
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::TAO_ServerRequestInfo_IR_StructDef_members_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -13581,7 +13549,7 @@
+ POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_set::TAO_ServerRequestInfo_IR_StructDef_members_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::StructDef *tao_impl,
- const IR::StructMemberSeq & members,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- members_ (members)
--{}
--
--Dynamic::ParameterList *
--POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_members = parameter_list->length ();
-- parameter_list->length (length_members + 1);
-- (*parameter_list)[length_members].argument <<= this->members_;
--
-- (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ return IR_NativeDef::_unchecked_narrow (obj.in ());
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -13653,6 +13621,7 @@
}
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_UnionDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+class TAO_IR_PrimitiveDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_UnionDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
private:
- unsigned int hash (const char *str, unsigned int len);
+@@ -13660,7 +13629,7 @@
public:
const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
};
--/* starting time is 16:31:12 */
-+/* starting time is 11:23:10 */
+-/* starting time is 18:47:28 */
++/* starting time is 11:23:09 */
/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_UnionDef_Perfect_Hash_OpTable -N lookup */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PrimitiveDef_Perfect_Hash_OpTable -N lookup */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_UnionDef_Perfect_Hash_OpTable -N lookup */
unsigned int
--TAO_IR_UnionDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+TAO_IR_PrimitiveDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
- static const unsigned char asso_values[] =
- {
- #if defined (ACE_MVS)
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 0,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 0,
-- 68, 25, 3, 0, 0, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 10, 0, 10,
-- 68, 10, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 30, 15, 68, 68, 68, 5, 5, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 0,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 0,
-+ 19, 19, 0, 5, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 5, 19, 19, 19, 19, 0, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19,
- #else
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
-- 68, 68, 68, 68, 68, 0, 68, 0, 68, 25,
-- 3, 0, 0, 68, 68, 68, 68, 68, 10, 0,
-- 10, 68, 10, 68, 68, 30, 15, 68, 68, 68,
-- 5, 5, 68, 68, 68, 68, 68, 68,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 0, 19, 0, 19, 19,
-+ 0, 5, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 5, 19, 19, 19,
-+ 19, 0, 19, 19, 19, 19, 19, 19,
- #endif /* ACE_MVS */
- };
- return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
- const class TAO_operation_db_entry *
--TAO_IR_UnionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+TAO_IR_PrimitiveDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
- enum
- {
-- TOTAL_KEYWORDS = 36,
-- MIN_WORD_LENGTH = 4,
-- MAX_WORD_LENGTH = 27,
-- MIN_HASH_VALUE = 4,
-- MAX_HASH_VALUE = 67,
-- HASH_VALUE_RANGE = 64,
-- DUPLICATES = 8
-+ TOTAL_KEYWORDS = 6,
-+ MIN_WORD_LENGTH = 5,
-+ MAX_WORD_LENGTH = 13,
-+ MIN_HASH_VALUE = 5,
-+ MAX_HASH_VALUE = 18,
-+ HASH_VALUE_RANGE = 14,
-+ DUPLICATES = 0
- };
-
- static const class TAO_operation_db_entry wordlist[] =
- {
-- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::UnionDef::move_skel},
-- {"_is_a", &POA_IR::UnionDef::_is_a_skel},
-- {"_get_name", &POA_IR::UnionDef::_get_name_skel},
-- {"_get_type", &POA_IR::UnionDef::_get_type_skel},
-- {"_set_name", &POA_IR::UnionDef::_set_name_skel},
-- {"_get_id", &POA_IR::UnionDef::_get_id_skel},
-- {"_set_id", &POA_IR::UnionDef::_set_id_skel},
-- {"describe", &POA_IR::UnionDef::describe_skel},
-- {"destroy", &POA_IR::UnionDef::destroy_skel},
-- {"_get_def_kind", &POA_IR::UnionDef::_get_def_kind_skel},
-- {"_get_absolute_name", &POA_IR::UnionDef::_get_absolute_name_skel},
-- {"lookup_name", &POA_IR::UnionDef::lookup_name_skel},
-- {"_get_version", &POA_IR::UnionDef::_get_version_skel},
-- {"_set_version", &POA_IR::UnionDef::_set_version_skel},
-- {"_get_discriminator_type", &POA_IR::UnionDef::_get_discriminator_type_skel},
-- {"_get_defined_in", &POA_IR::UnionDef::_get_defined_in_skel},
-- {"lookup", &POA_IR::UnionDef::lookup_skel},
-- {"_get_discriminator_type_def", &POA_IR::UnionDef::_get_discriminator_type_def_skel},
-- {"_set_discriminator_type_def", &POA_IR::UnionDef::_set_discriminator_type_def_skel},
-- {"_non_existent", &POA_IR::UnionDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::UnionDef::_get_containing_repository_skel},
-- {"create_enum", &POA_IR::UnionDef::create_enum_skel},
-- {"create_value", &POA_IR::UnionDef::create_value_skel},
-- {"create_module", &POA_IR::UnionDef::create_module_skel},
-- {"create_native", &POA_IR::UnionDef::create_native_skel},
-- {"create_interface", &POA_IR::UnionDef::create_interface_skel},
-- {"_get_members", &POA_IR::UnionDef::_get_members_skel},
-- {"_set_members", &POA_IR::UnionDef::_set_members_skel},
-- {"create_value_box", &POA_IR::UnionDef::create_value_box_skel},
-- {"create_union", &POA_IR::UnionDef::create_union_skel},
-- {"describe_contents", &POA_IR::UnionDef::describe_contents_skel},
-- {"create_exception", &POA_IR::UnionDef::create_exception_skel},
-- {"create_struct", &POA_IR::UnionDef::create_struct_skel},
-- {"create_constant", &POA_IR::UnionDef::create_constant_skel},
-- {"contents", &POA_IR::UnionDef::contents_skel},
-- {"create_alias", &POA_IR::UnionDef::create_alias_skel},
-- };
--
-- static const signed char lookup[] =
-- {
-- -1, -1, -6, -3, 4, 5, -1, -9, -2, -74, -70, 11, -1, -16,
-- -2, 12, 13, -1, 14, -21, -2, 15, -76, 18, -1, 19, 20, -75,
-- 23, -1, -1, 24, -1, -1, -27, -2, 25, 26, -71, -30, -2, 29,
-- -70, -1, -1, -1, 32, 33, -1, -1, 34, 35, -1, 36, -1, 37,
-- -1, -1, -1, -1, -1, -1, -1, 38, -1, -1, -1, 39,
-+ {"",0},{"",0},{"",0},{"",0},{"",0},
-+ {"_is_a", &POA_IR::PrimitiveDef::_is_a_skel},
-+ {"",0},
-+ {"destroy", &POA_IR::PrimitiveDef::destroy_skel},
-+ {"",0},
-+ {"_get_kind", &POA_IR::PrimitiveDef::_get_kind_skel},
-+ {"",0},{"",0},{"",0},
-+ {"_get_def_kind", &POA_IR::PrimitiveDef::_get_def_kind_skel},
-+ {"_get_type", &POA_IR::PrimitiveDef::_get_type_skel},
-+ {"",0},{"",0},{"",0},
-+ {"_non_existent", &POA_IR::PrimitiveDef::_non_existent_skel},
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -13789,63 +9092,45 @@
-
- if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
- {
-- int slot = lookup[key];
--
-- if (slot >= 0 && slot < MAX_HASH_VALUE)
-- {
-- const char *s = wordlist[slot].opname_;
--
-- if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-- return &wordlist[slot];
-- }
-- else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-- return 0;
-- else
-- {
-- unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-- const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-- const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
-+ const char *s = wordlist[key].opname_;
-
-- while (--ptr >= base)
-- if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-- return ptr;
-- }
-+ if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-+ return &wordlist[key];
- }
+@@ -13809,10 +13778,9 @@
}
return 0;
}
--/* ending time is 16:31:12 */
--static TAO_IR_UnionDef_Perfect_Hash_OpTable tao_IR_UnionDef_optable;
--
-+/* ending time is 11:23:10 */
-+static TAO_IR_PrimitiveDef_Perfect_Hash_OpTable tao_IR_PrimitiveDef_optable;
+-/* ending time is 18:47:28 */
++/* ending time is 11:23:09 */
+ static TAO_IR_UnionDef_Perfect_Hash_OpTable tao_IR_UnionDef_optable;
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Implementation
//
-
- // Factory function Implementation.
--POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker *POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::the_TAO_UnionDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker *POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::the_TAO_PrimitiveDef_Strategized_Proxy_Broker (void)
- {
-- static POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ static POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker strategized_proxy_broker;
- return &strategized_proxy_broker;
- }
-
--POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::_TAO_UnionDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::_TAO_PrimitiveDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- this->proxy_cache_[i] = 0;
-
- }
-
--POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::~_TAO_UnionDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::~_TAO_PrimitiveDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- delete this->proxy_cache_[i];
+@@ -13838,9 +13806,9 @@
}
-IR::_TAO_UnionDef_Proxy_Impl&
--POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::select_proxy (
++_TAO_UnionDef_Proxy_Impl&
+ POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::select_proxy (
- ::IR::UnionDef *object,
-+_TAO_PrimitiveDef_Proxy_Impl&
-+POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::select_proxy (
-+ IR_PrimitiveDef *object,
++ IR_UnionDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -13863,7 +9148,7 @@
- }
-
- void
--POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::create_proxy (
-+POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::create_proxy (
- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -13877,7 +9162,7 @@
+@@ -13872,7 +13840,7 @@
case TAO_ORB_Core::THRU_POA_STRATEGY:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
- POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl,
-+ _TAO_PrimitiveDef_ThruPOA_Proxy_Impl,
++ _TAO_UnionDef_ThruPOA_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -13887,7 +9172,7 @@
+@@ -13882,7 +13850,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
- ::IR::_TAO_UnionDef_Remote_Proxy_Impl,
-+ _TAO_PrimitiveDef_Remote_Proxy_Impl,
++ _TAO_UnionDef_Remote_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -13904,38 +9189,41 @@
+@@ -13899,26 +13867,26 @@
///////////////////////////////////////////////////////////////////////
-IR::_TAO_UnionDef_Proxy_Broker *
-IR__TAO_UnionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_PrimitiveDef_Proxy_Broker *
-+_TAO_PrimitiveDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
++_TAO_UnionDef_Proxy_Broker *
++_TAO_UnionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::the_TAO_UnionDef_Strategized_Proxy_Broker();
-+ return ::POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::the_TAO_PrimitiveDef_Strategized_Proxy_Broker();
+ return ::POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::the_TAO_UnionDef_Strategized_Proxy_Broker();
}
int
-IR__TAO_UnionDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (long _dummy_)
++_TAO_UnionDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
ACE_UNUSED_ARG (_dummy_);
- IR__TAO_UnionDef_Proxy_Broker_Factory_function_pointer =
- IR__TAO_UnionDef_Proxy_Broker_Factory_function;
-+ _TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer =
-+ _TAO_PrimitiveDef_Proxy_Broker_Factory_function;
++ _TAO_UnionDef_Proxy_Broker_Factory_function_pointer =
++ _TAO_UnionDef_Proxy_Broker_Factory_function;
return 0;
}
-static int IR__TAO_UnionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- IR__TAO_UnionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_UnionDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_PrimitiveDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-+ _TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer));
++static int _TAO_UnionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
++ _TAO_UnionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_UnionDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
- // ThruPOA Proxy Implementation
- //
-
--POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::_TAO_UnionDef_ThruPOA_Proxy_Impl (void)
-+POA_IR::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::~_TAO_PrimitiveDef_ThruPOA_Proxy_Impl (void)
- {}
-
- // ThruPOA Implementation of the IDL interface methods
+@@ -13961,7 +13929,7 @@
+ );
+ }
--CORBA::TypeCode_ptr POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type (
-+IR::PrimitiveKind POA_IR::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::kind (
+-IR::IDLType_ptr POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
++IR_IDLType_ptr POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -13943,7 +9231,7 @@
+@@ -13969,7 +13937,7 @@
CORBA::SystemException
))
{
-- CORBA::TypeCode_var _tao_retval;
-+ IR_PrimitiveKind _tao_retval;
+- IR::IDLType_var _tao_retval;
++ IR_IDLType_var _tao_retval;
ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -13951,617 +9239,115 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "discriminator_type",
-+ "kind",
- forward_to.out (),
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (0);
-+ ACE_CHECK_RETURN (_tao_retval);
- return ACE_reinterpret_cast (
-- POA_IR::UnionDef_ptr,
-+ POA_IR::PrimitiveDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/UnionDef:1.0"
-+ "IDL:omg.org/IR/PrimitiveDef:1.0"
- )
-- )->discriminator_type (
-+ )->kind (
- ACE_TRY_ENV
- );
- }
+@@ -13994,7 +13962,7 @@
--IR::IDLType_ptr POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+//
-+// End ThruPOA Proxy Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-+// skeleton constructor
-+POA_IR::PrimitiveDef::PrimitiveDef (void)
- {
-- IR::IDLType_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "discriminator_type_def",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::UnionDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/UnionDef:1.0"
-- )
-- )->discriminator_type_def (
-- ACE_TRY_ENV
-- );
-+ this->optable_ = &tao_IR_PrimitiveDef_optable;
- }
-
--void POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
-- CORBA_Object *_collocated_tao_target_,
+ void POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
+ CORBA_Object *_collocated_tao_target_,
- IR::IDLType_ptr discriminator_type_def,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+// copy ctor
-+POA_IR::PrimitiveDef::PrimitiveDef (const PrimitiveDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
-+ POA_CORBA_IRObject (rhs),
-+ TAO_ServantBase (rhs)
-+{}
-+
-+// skeleton destructor
-+POA_IR::PrimitiveDef::~PrimitiveDef (void)
- {
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "discriminator_type_def",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::UnionDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/UnionDef:1.0"
-- )
-- )->discriminator_type_def (
-- discriminator_type_def,
-- ACE_TRY_ENV
-- );
-- return;
++ IR_IDLType_ptr discriminator_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -14024,7 +13992,7 @@
+ return;
}
-IR::UnionMemberSeq * POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::members (
-- CORBA_Object *_collocated_tao_target_,
-+void POA_IR::PrimitiveDef::_get_kind_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
++IR_UnionMemberSeq * POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+)
+ )
+@@ -14032,7 +14000,7 @@
+ CORBA::SystemException
+ ))
{
- IR::UnionMemberSeq_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "members",
-- forward_to.out (),
-+ POA_IR::PrimitiveDef *_tao_impl = (POA_IR::PrimitiveDef *)_tao_object_reference;
-+
-+ IR_PrimitiveKind _tao_retval;
-+
-+ _tao_retval = _tao_impl->kind (
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::UnionDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/UnionDef:1.0"
-- )
-- )->members (
-- ACE_TRY_ENV
-- );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
++ IR_UnionMemberSeq_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -14057,7 +14025,7 @@
--void POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::members (
-- CORBA_Object *_collocated_tao_target_,
+ void POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
- const IR::UnionMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "members",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::UnionDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/UnionDef:1.0"
-- )
-- )->members (
-- members,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
--//
--// End ThruPOA Proxy Implementation
--///////////////////////////////////////////////////////////////////////
--
--// skeleton constructor
--POA_IR::UnionDef::UnionDef (void)
--{
-- this->optable_ = &tao_IR_UnionDef_optable;
--}
--
--// copy ctor
--POA_IR::UnionDef::UnionDef (const UnionDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,TypedefDef) (rhs),
-- ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-- ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-- ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -14103,7 +14071,7 @@
+ ACE_NESTED_CLASS (POA_IR,Container) (rhs),
+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-- TAO_ServantBase (rhs)
--{}
--
--// skeleton destructor
--POA_IR::UnionDef::~UnionDef (void)
--{
--}
--
--void POA_IR::UnionDef::_get_discriminator_type_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *)_tao_object_reference;
--
-- CORBA::TypeCode_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->discriminator_type (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::UnionDef::_get_discriminator_type_def_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *)_tao_object_reference;
--
-- IR::IDLType_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->discriminator_type_def (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::UnionDef::_set_discriminator_type_def_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
++ POA_CORBA_IRObject (rhs),
+ TAO_ServantBase (rhs)
+ {}
+
+@@ -14201,7 +14169,7 @@
+ {
+ POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *)_tao_object_reference;
+
+- IR::IDLType_var _tao_retval;
++ IR_IDLType_var _tao_retval;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -14228,7 +14196,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -14282,14 +14250,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
- IR::IDLType_var discriminator_type_def;
-- if (!(
-- (_tao_in >> discriminator_type_def.out ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- discriminator_type_def.in (),
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->discriminator_type_def (
-- discriminator_type_def.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::UnionDef::_get_members_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *)_tao_object_reference;
--
-- IR::UnionMemberSeq_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->members (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::UnionMemberSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::UnionDef::_set_members_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- IR::UnionMemberSeq members;
-- if (!(
-- (_tao_in >> members)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- members,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->members (
-- members,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
++ IR_IDLType_var discriminator_type_def;
+ if (!(
+ (_tao_in >> discriminator_type_def.out ())
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
-
--void POA_IR::UnionDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-+void POA_IR::PrimitiveDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -14360,7 +14326,7 @@
{
+ POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *)_tao_object_reference;
+
+- IR::UnionMemberSeq_var _tao_retval;
++ IR_UnionMemberSeq_var _tao_retval;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -14387,7 +14353,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::UnionMemberSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_UnionMemberSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -14441,14 +14407,12 @@
TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *) _tao_object_reference;
-+ POA_IR::PrimitiveDef *_tao_impl = (POA_IR::PrimitiveDef *) _tao_object_reference;
+ POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+- IR::UnionMemberSeq members;
++ IR_UnionMemberSeq members;
+ if (!(
+ (_tao_in >> members)
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -14521,7 +14485,7 @@
+ POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *) _tao_object_reference;
CORBA::Boolean _tao_retval = 0;
CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
ACE_THROW (CORBA::MARSHAL ());
--
-+
+
_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -14529,7 +14493,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -18692,21 +3780,8 @@
ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::UnionDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::PrimitiveDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *) _tao_object_reference;
-+ POA_IR::PrimitiveDef *_tao_impl = (POA_IR::PrimitiveDef *) _tao_object_reference;
- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -14546,7 +14510,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -18714,40 +3789,7 @@
ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Boolean POA_IR::UnionDef::_is_a (
-+CORBA::Boolean POA_IR::PrimitiveDef::_is_a (
- const 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/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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-@@ -14570,39 +9356,33 @@
- return 0;
- }
-
--void* POA_IR::UnionDef::_downcast (
-+void* POA_IR::PrimitiveDef::_downcast (
- const char* logical_type_id
- )
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/UnionDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::UnionDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/TypedefDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::TypedefDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-- return ACE_static_cast (POA_IR::Container_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-- return ACE_static_cast (POA_IR::Contained_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/PrimitiveDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::PrimitiveDef_ptr, this);
+@@ -14583,7 +14547,7 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
return ACE_static_cast (POA_IR::IDLType_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
@@ -18756,1011 +3798,201 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
- }
-
--void POA_IR::UnionDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::PrimitiveDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--const char* POA_IR::UnionDef::_interface_repository_id (void) const
-+const char* POA_IR::PrimitiveDef::_interface_repository_id (void) const
- {
-- return "IDL:omg.org/IR/UnionDef:1.0";
-+ return "IDL:omg.org/IR/PrimitiveDef:1.0";
- }
-
--IR::UnionDef*
--POA_IR::UnionDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+IR::PrimitiveDef*
-+POA_IR::PrimitiveDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-@@ -14615,493 +9395,100 @@
+@@ -14613,10 +14577,9 @@
ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
CORBA::Object_var obj = tmp;
- return ::IR::UnionDef::_unchecked_narrow (obj.in ());
--}
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::UnionDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ return IR_PrimitiveDef::_unchecked_narrow (obj.in ());
++ return IR_UnionDef::_unchecked_narrow (obj.in ());
}
--CORBA::Any *
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-
--char *
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::result (CORBA::TypeCode_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::UnionDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get::result (IR::IDLType_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::UnionDef *tao_impl
-- ,
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -14771,7 +14734,7 @@
+ POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::UnionDef *tao_impl,
- IR::IDLType_ptr discriminator_type_def,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- discriminator_type_def_ (discriminator_type_def)
--{}
--
--Dynamic::ParameterList *
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_discriminator_type_def = parameter_list->length ();
-- parameter_list->length (length_discriminator_type_def + 1);
-- (*parameter_list)[length_discriminator_type_def].argument <<= this->discriminator_type_def_;
--
-- (*parameter_list)[length_discriminator_type_def].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get::TAO_ServerRequestInfo_IR_UnionDef_members_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::UnionDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get::result (IR::UnionMemberSeq * result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_set::TAO_ServerRequestInfo_IR_UnionDef_members_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::UnionDef *tao_impl
-- ,
++ IR_IDLType_ptr discriminator_type_def,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -14920,7 +14883,7 @@
+ POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_set::TAO_ServerRequestInfo_IR_UnionDef_members_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::UnionDef *tao_impl,
- const IR::UnionMemberSeq & members,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- members_ (members)
--{}
--
--Dynamic::ParameterList *
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_members = parameter_list->length ();
-- parameter_list->length (length_members + 1);
-- (*parameter_list)[length_members].argument <<= this->members_;
--
-- (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_EnumDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+class TAO_IR_StringDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -14992,6 +14955,7 @@
+ }
+
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_EnumDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
private:
- unsigned int hash (const char *str, unsigned int len);
+@@ -14999,7 +14963,7 @@
public:
const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
};
--/* starting time is 16:31:12 */
+-/* starting time is 18:47:28 */
+/* starting time is 11:23:10 */
/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EnumDef_Perfect_Hash_OpTable -N lookup */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_StringDef_Perfect_Hash_OpTable -N lookup */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EnumDef_Perfect_Hash_OpTable -N lookup */
unsigned int
--TAO_IR_EnumDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+TAO_IR_StringDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
- static const unsigned char asso_values[] =
- {
- #if defined (ACE_MVS)
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 0, 0, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 10, 10, 37, 37, 37, 37, 10, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 0,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 0,
-+ 19, 19, 0, 0, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 5, 19, 19, 19, 19, 0, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19,
- #else
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-- 0, 0, 37, 37, 37, 37, 37, 37, 37, 0,
-- 0, 37, 37, 37, 37, 10, 10, 37, 37, 37,
-- 37, 10, 37, 37, 37, 37, 37, 37,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 0, 19, 0, 19, 19,
-+ 0, 0, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 5, 19, 19, 19,
-+ 19, 0, 19, 19, 19, 19, 19, 19,
- #endif /* ACE_MVS */
- };
- return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
- const class TAO_operation_db_entry *
--TAO_IR_EnumDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+TAO_IR_StringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
- enum
- {
-- TOTAL_KEYWORDS = 18,
-- MIN_WORD_LENGTH = 4,
-- MAX_WORD_LENGTH = 26,
-- MIN_HASH_VALUE = 4,
-- MAX_HASH_VALUE = 36,
-- HASH_VALUE_RANGE = 33,
-- DUPLICATES = 6
-+ TOTAL_KEYWORDS = 7,
-+ MIN_WORD_LENGTH = 5,
-+ MAX_WORD_LENGTH = 13,
-+ MIN_HASH_VALUE = 5,
-+ MAX_HASH_VALUE = 18,
-+ HASH_VALUE_RANGE = 14,
-+ DUPLICATES = 2
- };
-
- static const class TAO_operation_db_entry wordlist[] =
- {
-- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::EnumDef::move_skel},
-- {"_is_a", &POA_IR::EnumDef::_is_a_skel},
-- {"_get_id", &POA_IR::EnumDef::_get_id_skel},
-- {"_set_id", &POA_IR::EnumDef::_set_id_skel},
-- {"describe", &POA_IR::EnumDef::describe_skel},
-- {"_get_name", &POA_IR::EnumDef::_get_name_skel},
-- {"_get_type", &POA_IR::EnumDef::_get_type_skel},
-- {"_set_name", &POA_IR::EnumDef::_set_name_skel},
-- {"_get_version", &POA_IR::EnumDef::_get_version_skel},
-- {"_set_version", &POA_IR::EnumDef::_set_version_skel},
-- {"_get_def_kind", &POA_IR::EnumDef::_get_def_kind_skel},
-- {"_get_defined_in", &POA_IR::EnumDef::_get_defined_in_skel},
-- {"destroy", &POA_IR::EnumDef::destroy_skel},
-- {"_get_absolute_name", &POA_IR::EnumDef::_get_absolute_name_skel},
-- {"_get_members", &POA_IR::EnumDef::_get_members_skel},
-- {"_set_members", &POA_IR::EnumDef::_set_members_skel},
-- {"_non_existent", &POA_IR::EnumDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::EnumDef::_get_containing_repository_skel},
-+ {"",0},{"",0},{"",0},{"",0},{"",0},
-+ {"_is_a", &POA_IR::StringDef::_is_a_skel},
-+ {"destroy", &POA_IR::StringDef::destroy_skel},
-+ {"_get_type", &POA_IR::StringDef::_get_type_skel},
-+ {"_get_bound", &POA_IR::StringDef::_get_bound_skel},
-+ {"_set_bound", &POA_IR::StringDef::_set_bound_skel},
-+ {"_get_def_kind", &POA_IR::StringDef::_get_def_kind_skel},
-+ {"_non_existent", &POA_IR::StringDef::_non_existent_skel},
- };
-
- static const signed char lookup[] =
- {
-- -6, -2, -9, -3, 4, 5, -1, -43, 8, -43, -12, -2, -38, 14,
-- -1, 15, -1, 16, 17, -1, -18, -2, -38, 20, -1, -1, -1, -1,
-- -1, -1, -1, -1, -1, -1, -1, -1, 21,
-+ -1, -1, -1, -8, -2, 5, -1, 6, -1, 7, -25, -1, -1, 10,
-+ -1, -1, -1, -1, 11,
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -15135,38 +9522,37 @@
+@@ -15128,10 +15092,9 @@
}
return 0;
}
--/* ending time is 16:31:12 */
--static TAO_IR_EnumDef_Perfect_Hash_OpTable tao_IR_EnumDef_optable;
--
+-/* ending time is 18:47:28 */
+/* ending time is 11:23:10 */
-+static TAO_IR_StringDef_Perfect_Hash_OpTable tao_IR_StringDef_optable;
+ static TAO_IR_EnumDef_Perfect_Hash_OpTable tao_IR_EnumDef_optable;
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Implementation
//
-
- // Factory function Implementation.
--POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker *POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::the_TAO_EnumDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_StringDef_Strategized_Proxy_Broker *POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::the_TAO_StringDef_Strategized_Proxy_Broker (void)
- {
-- static POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ static POA_IR::_TAO_StringDef_Strategized_Proxy_Broker strategized_proxy_broker;
- return &strategized_proxy_broker;
- }
-
--POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::_TAO_EnumDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::_TAO_StringDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- this->proxy_cache_[i] = 0;
-
- }
-
--POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::~_TAO_EnumDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::~_TAO_StringDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- delete this->proxy_cache_[i];
+@@ -15157,9 +15120,9 @@
}
-IR::_TAO_EnumDef_Proxy_Impl&
--POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::select_proxy (
++_TAO_EnumDef_Proxy_Impl&
+ POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::select_proxy (
- ::IR::EnumDef *object,
-+_TAO_StringDef_Proxy_Impl&
-+POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::select_proxy (
-+ IR_StringDef *object,
++ IR_EnumDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -15184,7 +9570,7 @@
- }
-
- void
--POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::create_proxy (
-+POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::create_proxy (
- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -15198,7 +9584,7 @@
+@@ -15191,7 +15154,7 @@
case TAO_ORB_Core::THRU_POA_STRATEGY:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
- POA_IR::_TAO_EnumDef_ThruPOA_Proxy_Impl,
-+ _TAO_StringDef_ThruPOA_Proxy_Impl,
++ _TAO_EnumDef_ThruPOA_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -15208,7 +9594,7 @@
+@@ -15201,7 +15164,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
- ::IR::_TAO_EnumDef_Remote_Proxy_Impl,
-+ _TAO_StringDef_Remote_Proxy_Impl,
++ _TAO_EnumDef_Remote_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -15225,38 +9611,41 @@
+@@ -15218,26 +15181,26 @@
///////////////////////////////////////////////////////////////////////
-IR::_TAO_EnumDef_Proxy_Broker *
-IR__TAO_EnumDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_StringDef_Proxy_Broker *
-+_TAO_StringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
++_TAO_EnumDef_Proxy_Broker *
++_TAO_EnumDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::the_TAO_EnumDef_Strategized_Proxy_Broker();
-+ return ::POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::the_TAO_StringDef_Strategized_Proxy_Broker();
+ return ::POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::the_TAO_EnumDef_Strategized_Proxy_Broker();
}
int
-IR__TAO_EnumDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_StringDef_Proxy_Broker_Factory_Initializer (long _dummy_)
++_TAO_EnumDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
ACE_UNUSED_ARG (_dummy_);
- IR__TAO_EnumDef_Proxy_Broker_Factory_function_pointer =
- IR__TAO_EnumDef_Proxy_Broker_Factory_function;
-+ _TAO_StringDef_Proxy_Broker_Factory_function_pointer =
-+ _TAO_StringDef_Proxy_Broker_Factory_function;
++ _TAO_EnumDef_Proxy_Broker_Factory_function_pointer =
++ _TAO_EnumDef_Proxy_Broker_Factory_function;
return 0;
}
-static int IR__TAO_EnumDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- IR__TAO_EnumDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_EnumDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_StringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-+ _TAO_StringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_StringDef_Proxy_Broker_Factory_Initializer));
++static int _TAO_EnumDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
++ _TAO_EnumDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_EnumDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
- // ThruPOA Proxy Implementation
- //
-
--POA_IR::_TAO_EnumDef_ThruPOA_Proxy_Impl::_TAO_EnumDef_ThruPOA_Proxy_Impl (void)
-+POA_IR::_TAO_StringDef_ThruPOA_Proxy_Impl::_TAO_StringDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_StringDef_ThruPOA_Proxy_Impl::~_TAO_StringDef_ThruPOA_Proxy_Impl (void)
- {}
-
- // ThruPOA Implementation of the IDL interface methods
-
--IR::EnumMemberSeq * POA_IR::_TAO_EnumDef_ThruPOA_Proxy_Impl::members (
-+CORBA::ULong POA_IR::_TAO_StringDef_ThruPOA_Proxy_Impl::bound (
- CORBA_Object *_collocated_tao_target_,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -15264,7 +9653,7 @@
+@@ -15257,7 +15220,7 @@
CORBA::SystemException
))
{
- IR::EnumMemberSeq_var _tao_retval;
-+ CORBA::ULong _tao_retval = 0;
++ IR_EnumMemberSeq_var _tao_retval;
ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -15272,24 +9661,24 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "members",
-+ "bound",
- forward_to.out (),
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (0);
-+ ACE_CHECK_RETURN (_tao_retval);
- return ACE_reinterpret_cast (
-- POA_IR::EnumDef_ptr,
-+ POA_IR::StringDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/EnumDef:1.0"
-+ "IDL:omg.org/IR/StringDef:1.0"
- )
-- )->members (
-+ )->bound (
- ACE_TRY_ENV
- );
- }
+@@ -15282,7 +15245,7 @@
--void POA_IR::_TAO_EnumDef_ThruPOA_Proxy_Impl::members (
-+void POA_IR::_TAO_StringDef_ThruPOA_Proxy_Impl::bound (
+ void POA_IR::_TAO_EnumDef_ThruPOA_Proxy_Impl::members (
CORBA_Object *_collocated_tao_target_,
- const IR::EnumMemberSeq & members,
-+ CORBA::ULong bound,
++ const IR_EnumMemberSeq & members,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -15302,18 +9691,18 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "members",
-+ "bound",
- forward_to.out (),
- ACE_TRY_ENV
- );
- ACE_CHECK;
- ACE_reinterpret_cast (
-- POA_IR::EnumDef_ptr,
-+ POA_IR::StringDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/EnumDef:1.0"
-+ "IDL:omg.org/IR/StringDef:1.0"
- )
-- )->members (
-- members,
-+ )->bound (
-+ bound,
- ACE_TRY_ENV
- );
- return;
-@@ -15324,232 +9713,121 @@
- ///////////////////////////////////////////////////////////////////////
-
- // skeleton constructor
--POA_IR::EnumDef::EnumDef (void)
-+POA_IR::StringDef::StringDef (void)
- {
-- this->optable_ = &tao_IR_EnumDef_optable;
-+ this->optable_ = &tao_IR_StringDef_optable;
- }
-
- // copy ctor
--POA_IR::EnumDef::EnumDef (const EnumDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,TypedefDef) (rhs),
-- ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-- ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+@@ -15327,7 +15290,7 @@
+ : ACE_NESTED_CLASS (POA_IR,TypedefDef) (rhs),
+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+POA_IR::StringDef::StringDef (const StringDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+ POA_CORBA_IRObject (rhs),
TAO_ServantBase (rhs)
{}
- // skeleton destructor
--POA_IR::EnumDef::~EnumDef (void)
-+POA_IR::StringDef::~StringDef (void)
+@@ -15345,7 +15308,7 @@
{
- }
-
--void POA_IR::EnumDef::_get_members_skel (
-+void POA_IR::StringDef::_get_bound_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- POA_IR::EnumDef *_tao_impl = (POA_IR::EnumDef *)_tao_object_reference;
-+ POA_IR::StringDef *_tao_impl = (POA_IR::StringDef *)_tao_object_reference;
-
-- IR::EnumMemberSeq_var _tao_retval;
-+ CORBA::ULong _tao_retval = 0;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->bound (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->members (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::EnumMemberSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
-- (_tao_out << _tao_retval.in ())
-+ (_tao_out << _tao_retval)
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
+ POA_IR::EnumDef *_tao_impl = (POA_IR::EnumDef *)_tao_object_reference;
+
+- IR::EnumMemberSeq_var _tao_retval;
++ IR_EnumMemberSeq_var _tao_retval;
--void POA_IR::EnumDef::_set_members_skel (
-+void POA_IR::StringDef::_set_bound_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -15372,7 +15335,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::EnumMemberSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_EnumMemberSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -15426,14 +15389,12 @@
TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::EnumDef *_tao_impl = (POA_IR::EnumDef *)_tao_object_reference;
-+ POA_IR::StringDef *_tao_impl = (POA_IR::StringDef *)_tao_object_reference;
-
--_tao_server_request.argument_flag (0);
+ POA_IR::EnumDef *_tao_impl = (POA_IR::EnumDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
- IR::EnumMemberSeq members;
-+ CORBA::ULong bound;
++ IR_EnumMemberSeq members;
if (!(
-- (_tao_in >> members)
-+ (_tao_in >> bound)
+ (_tao_in >> members)
))
-- ACE_THROW (CORBA::MARSHAL());
-+ ACE_THROW (CORBA::MARSHAL () );
+ ACE_THROW (CORBA::MARSHAL());
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- members,
-+ _tao_impl->bound (
-+ bound,
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->members (
-- members,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- }
-
--void POA_IR::EnumDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::StringDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::EnumDef *_tao_impl = (POA_IR::EnumDef *) _tao_object_reference;
-+ POA_IR::StringDef *_tao_impl = (POA_IR::StringDef *) _tao_object_reference;
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -15506,7 +15467,7 @@
+ POA_IR::EnumDef *_tao_impl = (POA_IR::EnumDef *) _tao_object_reference;
CORBA::Boolean _tao_retval = 0;
CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
ACE_THROW (CORBA::MARSHAL ());
--
-+
+
_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -15514,7 +15475,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -19768,21 +4000,8 @@
ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::EnumDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::StringDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::EnumDef *_tao_impl = (POA_IR::EnumDef *) _tao_object_reference;
-+ POA_IR::StringDef *_tao_impl = (POA_IR::StringDef *) _tao_object_reference;
- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -15531,7 +15492,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -19790,37 +4009,7 @@
ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Boolean POA_IR::EnumDef::_is_a (
-+CORBA::Boolean POA_IR::StringDef::_is_a (
- const 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/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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-@@ -15558,37 +9836,33 @@
- return 0;
- }
-
--void* POA_IR::EnumDef::_downcast (
-+void* POA_IR::StringDef::_downcast (
- const char* logical_type_id
- )
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/EnumDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::EnumDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/TypedefDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::TypedefDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-- return ACE_static_cast (POA_IR::Contained_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/StringDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::StringDef_ptr, this);
+@@ -15565,7 +15526,7 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
return ACE_static_cast (POA_IR::IDLType_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
@@ -19829,794 +4018,201 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
- }
-
--void POA_IR::EnumDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::StringDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--const char* POA_IR::EnumDef::_interface_repository_id (void) const
-+const char* POA_IR::StringDef::_interface_repository_id (void) const
- {
-- return "IDL:omg.org/IR/EnumDef:1.0";
-+ return "IDL:omg.org/IR/StringDef:1.0";
- }
-
--IR::EnumDef*
--POA_IR::EnumDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+IR::StringDef*
-+POA_IR::StringDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-@@ -15601,266 +9875,100 @@
+@@ -15595,10 +15556,9 @@
ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
CORBA::Object_var obj = tmp;
- return ::IR::EnumDef::_unchecked_narrow (obj.in ());
--}
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::TAO_ServerRequestInfo_IR_EnumDef_members_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::EnumDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::result (IR::EnumMemberSeq * result)
--{
-- // Update the result.
-- this->_result = result;
--}
++ return IR_EnumDef::_unchecked_narrow (obj.in ());
+ }
+
-
--POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_set::TAO_ServerRequestInfo_IR_EnumDef_members_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::EnumDef *tao_impl
-- ,
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::TAO_ServerRequestInfo_IR_EnumDef_members_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -15678,7 +15638,7 @@
+ POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_set::TAO_ServerRequestInfo_IR_EnumDef_members_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::EnumDef *tao_impl,
- const IR::EnumMemberSeq & members,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- members_ (members)
--{}
--
--Dynamic::ParameterList *
--POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_members = parameter_list->length ();
-- parameter_list->length (length_members + 1);
-- (*parameter_list)[length_members].argument <<= this->members_;
--
-- (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ return IR_StringDef::_unchecked_narrow (obj.in ());
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -15750,6 +15710,7 @@
}
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_AliasDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+class TAO_IR_WstringDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_AliasDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
private:
- unsigned int hash (const char *str, unsigned int len);
+@@ -15757,7 +15718,7 @@
public:
const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
};
--/* starting time is 16:31:12 */
+-/* starting time is 18:47:28 */
+/* starting time is 11:23:10 */
/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_AliasDef_Perfect_Hash_OpTable -N lookup */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_WstringDef_Perfect_Hash_OpTable -N lookup */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_AliasDef_Perfect_Hash_OpTable -N lookup */
unsigned int
--TAO_IR_AliasDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+TAO_IR_WstringDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
- static const unsigned char asso_values[] =
- {
- #if defined (ACE_MVS)
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 0, 0, 0, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37,
--#else
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-- 0, 0, 0, 37, 37, 37, 37, 37, 37, 0,
-- 0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
-- 37, 10, 37, 37, 37, 37, 37, 37,
--#endif /* ACE_MVS */
-- };
-- return len + asso_values[str[len - 1]] + asso_values[str[0]];
--}
--
--const class TAO_operation_db_entry *
--TAO_IR_AliasDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
--{
-- enum
-- {
-- TOTAL_KEYWORDS = 18,
-- MIN_WORD_LENGTH = 4,
-- MAX_WORD_LENGTH = 26,
-- MIN_HASH_VALUE = 4,
-- MAX_HASH_VALUE = 36,
-- HASH_VALUE_RANGE = 33,
-- DUPLICATES = 6
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 0,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 0,
-+ 19, 19, 0, 0, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 5, 19, 19, 19, 19, 0, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19,
-+#else
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 0, 19, 0, 19, 19,
-+ 0, 0, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 5, 19, 19, 19,
-+ 19, 0, 19, 19, 19, 19, 19, 19,
-+#endif /* ACE_MVS */
-+ };
-+ return len + asso_values[str[len - 1]] + asso_values[str[0]];
-+}
-+
-+const class TAO_operation_db_entry *
-+TAO_IR_WstringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+{
-+ enum
-+ {
-+ TOTAL_KEYWORDS = 7,
-+ MIN_WORD_LENGTH = 5,
-+ MAX_WORD_LENGTH = 13,
-+ MIN_HASH_VALUE = 5,
-+ MAX_HASH_VALUE = 18,
-+ HASH_VALUE_RANGE = 14,
-+ DUPLICATES = 2
- };
-
- static const class TAO_operation_db_entry wordlist[] =
- {
-- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::AliasDef::move_skel},
-- {"_is_a", &POA_IR::AliasDef::_is_a_skel},
-- {"_get_id", &POA_IR::AliasDef::_get_id_skel},
-- {"_set_id", &POA_IR::AliasDef::_set_id_skel},
-- {"describe", &POA_IR::AliasDef::describe_skel},
-- {"_get_name", &POA_IR::AliasDef::_get_name_skel},
-- {"_get_type", &POA_IR::AliasDef::_get_type_skel},
-- {"_set_name", &POA_IR::AliasDef::_set_name_skel},
-- {"_get_version", &POA_IR::AliasDef::_get_version_skel},
-- {"_set_version", &POA_IR::AliasDef::_set_version_skel},
-- {"_get_def_kind", &POA_IR::AliasDef::_get_def_kind_skel},
-- {"_get_defined_in", &POA_IR::AliasDef::_get_defined_in_skel},
-- {"destroy", &POA_IR::AliasDef::destroy_skel},
-- {"_get_absolute_name", &POA_IR::AliasDef::_get_absolute_name_skel},
-- {"_get_original_type_def", &POA_IR::AliasDef::_get_original_type_def_skel},
-- {"_set_original_type_def", &POA_IR::AliasDef::_set_original_type_def_skel},
-- {"_non_existent", &POA_IR::AliasDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::AliasDef::_get_containing_repository_skel},
-+ {"",0},{"",0},{"",0},{"",0},{"",0},
-+ {"_is_a", &POA_IR::WstringDef::_is_a_skel},
-+ {"destroy", &POA_IR::WstringDef::destroy_skel},
-+ {"_get_type", &POA_IR::WstringDef::_get_type_skel},
-+ {"_get_bound", &POA_IR::WstringDef::_get_bound_skel},
-+ {"_set_bound", &POA_IR::WstringDef::_set_bound_skel},
-+ {"_get_def_kind", &POA_IR::WstringDef::_get_def_kind_skel},
-+ {"_non_existent", &POA_IR::WstringDef::_non_existent_skel},
- };
-
- static const signed char lookup[] =
- {
-- -6, -2, -9, -3, 4, 5, -1, -43, 8, -43, -12, -2, -38, 14,
-- -1, 15, -1, 16, 17, -1, -18, -2, -38, 20, -1, -1, -1, -1,
-- -1, -1, -1, -1, -1, -1, -1, -1, 21,
-+ -1, -1, -1, -8, -2, 5, -1, 6, -1, 7, -25, -1, -1, 10,
-+ -1, -1, -1, -1, 11,
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -15894,38 +10002,37 @@
+@@ -15886,10 +15847,9 @@
}
return 0;
}
--/* ending time is 16:31:12 */
--static TAO_IR_AliasDef_Perfect_Hash_OpTable tao_IR_AliasDef_optable;
--
+-/* ending time is 18:47:28 */
+/* ending time is 11:23:10 */
-+static TAO_IR_WstringDef_Perfect_Hash_OpTable tao_IR_WstringDef_optable;
+ static TAO_IR_AliasDef_Perfect_Hash_OpTable tao_IR_AliasDef_optable;
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Implementation
//
-
- // Factory function Implementation.
--POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker *POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::the_TAO_AliasDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker *POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::the_TAO_WstringDef_Strategized_Proxy_Broker (void)
- {
-- static POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ static POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker strategized_proxy_broker;
- return &strategized_proxy_broker;
- }
-
--POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::_TAO_AliasDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::_TAO_WstringDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- this->proxy_cache_[i] = 0;
-
- }
-
--POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::~_TAO_AliasDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::~_TAO_WstringDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- delete this->proxy_cache_[i];
+@@ -15915,9 +15875,9 @@
}
-IR::_TAO_AliasDef_Proxy_Impl&
--POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::select_proxy (
++_TAO_AliasDef_Proxy_Impl&
+ POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::select_proxy (
- ::IR::AliasDef *object,
-+_TAO_WstringDef_Proxy_Impl&
-+POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::select_proxy (
-+ IR_WstringDef *object,
++ IR_AliasDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -15943,7 +10050,7 @@
- }
-
- void
--POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::create_proxy (
-+POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::create_proxy (
- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -15957,7 +10064,7 @@
+@@ -15949,7 +15909,7 @@
case TAO_ORB_Core::THRU_POA_STRATEGY:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
- POA_IR::_TAO_AliasDef_ThruPOA_Proxy_Impl,
-+ _TAO_WstringDef_ThruPOA_Proxy_Impl,
++ _TAO_AliasDef_ThruPOA_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -15967,7 +10074,7 @@
+@@ -15959,7 +15919,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
- ::IR::_TAO_AliasDef_Remote_Proxy_Impl,
-+ _TAO_WstringDef_Remote_Proxy_Impl,
++ _TAO_AliasDef_Remote_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -15984,38 +10091,41 @@
+@@ -15976,26 +15936,26 @@
///////////////////////////////////////////////////////////////////////
-IR::_TAO_AliasDef_Proxy_Broker *
-IR__TAO_AliasDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_WstringDef_Proxy_Broker *
-+_TAO_WstringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
++_TAO_AliasDef_Proxy_Broker *
++_TAO_AliasDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::the_TAO_AliasDef_Strategized_Proxy_Broker();
-+ return ::POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::the_TAO_WstringDef_Strategized_Proxy_Broker();
+ return ::POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::the_TAO_AliasDef_Strategized_Proxy_Broker();
}
int
-IR__TAO_AliasDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_WstringDef_Proxy_Broker_Factory_Initializer (long _dummy_)
++_TAO_AliasDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
ACE_UNUSED_ARG (_dummy_);
- IR__TAO_AliasDef_Proxy_Broker_Factory_function_pointer =
- IR__TAO_AliasDef_Proxy_Broker_Factory_function;
-+ _TAO_WstringDef_Proxy_Broker_Factory_function_pointer =
-+ _TAO_WstringDef_Proxy_Broker_Factory_function;
++ _TAO_AliasDef_Proxy_Broker_Factory_function_pointer =
++ _TAO_AliasDef_Proxy_Broker_Factory_function;
return 0;
}
-static int IR__TAO_AliasDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- IR__TAO_AliasDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_AliasDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_WstringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-+ _TAO_WstringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_WstringDef_Proxy_Broker_Factory_Initializer));
++static int _TAO_AliasDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
++ _TAO_AliasDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_AliasDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
- // ThruPOA Proxy Implementation
- //
-
--POA_IR::_TAO_AliasDef_ThruPOA_Proxy_Impl::_TAO_AliasDef_ThruPOA_Proxy_Impl (void)
-+POA_IR::_TAO_WstringDef_ThruPOA_Proxy_Impl::_TAO_WstringDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_WstringDef_ThruPOA_Proxy_Impl::~_TAO_WstringDef_ThruPOA_Proxy_Impl (void)
- {}
+@@ -16007,7 +15967,7 @@
// ThruPOA Implementation of the IDL interface methods
-IR::IDLType_ptr POA_IR::_TAO_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
-+CORBA::ULong POA_IR::_TAO_WstringDef_ThruPOA_Proxy_Impl::bound (
++IR_IDLType_ptr POA_IR::_TAO_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -16023,7 +10133,7 @@
+@@ -16015,7 +15975,7 @@
CORBA::SystemException
))
{
- IR::IDLType_var _tao_retval;
-+ CORBA::ULong _tao_retval = 0;
++ IR_IDLType_var _tao_retval;
ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -16031,24 +10141,24 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "original_type_def",
-+ "bound",
- forward_to.out (),
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (0);
-+ ACE_CHECK_RETURN (_tao_retval);
- return ACE_reinterpret_cast (
-- POA_IR::AliasDef_ptr,
-+ POA_IR::WstringDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/AliasDef:1.0"
-+ "IDL:omg.org/IR/WstringDef:1.0"
- )
-- )->original_type_def (
-+ )->bound (
- ACE_TRY_ENV
- );
- }
+@@ -16040,7 +16000,7 @@
--void POA_IR::_TAO_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
-+void POA_IR::_TAO_WstringDef_ThruPOA_Proxy_Impl::bound (
+ void POA_IR::_TAO_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
CORBA_Object *_collocated_tao_target_,
- IR::IDLType_ptr original_type_def,
-+ CORBA::ULong bound,
++ IR_IDLType_ptr original_type_def,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -16061,18 +10171,18 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "original_type_def",
-+ "bound",
- forward_to.out (),
- ACE_TRY_ENV
- );
- ACE_CHECK;
- ACE_reinterpret_cast (
-- POA_IR::AliasDef_ptr,
-+ POA_IR::WstringDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/AliasDef:1.0"
-+ "IDL:omg.org/IR/WstringDef:1.0"
- )
-- )->original_type_def (
-- original_type_def,
-+ )->bound (
-+ bound,
- ACE_TRY_ENV
- );
- return;
-@@ -16083,232 +10193,121 @@
- ///////////////////////////////////////////////////////////////////////
-
- // skeleton constructor
--POA_IR::AliasDef::AliasDef (void)
-+POA_IR::WstringDef::WstringDef (void)
- {
-- this->optable_ = &tao_IR_AliasDef_optable;
-+ this->optable_ = &tao_IR_WstringDef_optable;
- }
-
- // copy ctor
--POA_IR::AliasDef::AliasDef (const AliasDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,TypedefDef) (rhs),
-- ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-- ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+@@ -16085,7 +16045,7 @@
+ : ACE_NESTED_CLASS (POA_IR,TypedefDef) (rhs),
+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+POA_IR::WstringDef::WstringDef (const WstringDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+ POA_CORBA_IRObject (rhs),
TAO_ServantBase (rhs)
{}
- // skeleton destructor
--POA_IR::AliasDef::~AliasDef (void)
-+POA_IR::WstringDef::~WstringDef (void)
- {
- }
-
--void POA_IR::AliasDef::_get_original_type_def_skel (
-+void POA_IR::WstringDef::_get_bound_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
+@@ -16103,7 +16063,7 @@
{
-- POA_IR::AliasDef *_tao_impl = (POA_IR::AliasDef *)_tao_object_reference;
-+ POA_IR::WstringDef *_tao_impl = (POA_IR::WstringDef *)_tao_object_reference;
-
-- IR::IDLType_var _tao_retval;
-+ CORBA::ULong _tao_retval = 0;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->bound (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->original_type_def (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
-- (_tao_out << _tao_retval.in ())
-+ (_tao_out << _tao_retval)
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
+ POA_IR::AliasDef *_tao_impl = (POA_IR::AliasDef *)_tao_object_reference;
+
+- IR::IDLType_var _tao_retval;
++ IR_IDLType_var _tao_retval;
--void POA_IR::AliasDef::_set_original_type_def_skel (
-+void POA_IR::WstringDef::_set_bound_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -16130,7 +16090,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -16184,14 +16144,12 @@
TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::AliasDef *_tao_impl = (POA_IR::AliasDef *)_tao_object_reference;
-+ POA_IR::WstringDef *_tao_impl = (POA_IR::WstringDef *)_tao_object_reference;
-
--_tao_server_request.argument_flag (0);
+ POA_IR::AliasDef *_tao_impl = (POA_IR::AliasDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
- IR::IDLType_var original_type_def;
-+ CORBA::ULong bound;
++ IR_IDLType_var original_type_def;
if (!(
-- (_tao_in >> original_type_def.out ())
-+ (_tao_in >> bound)
+ (_tao_in >> original_type_def.out ())
))
-- ACE_THROW (CORBA::MARSHAL());
-+ ACE_THROW (CORBA::MARSHAL () );
+ ACE_THROW (CORBA::MARSHAL());
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- original_type_def.in (),
-+ _tao_impl->bound (
-+ bound,
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->original_type_def (
-- original_type_def.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- }
-
--void POA_IR::AliasDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::WstringDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::AliasDef *_tao_impl = (POA_IR::AliasDef *) _tao_object_reference;
-+ POA_IR::WstringDef *_tao_impl = (POA_IR::WstringDef *) _tao_object_reference;
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -16264,7 +16222,7 @@
+ POA_IR::AliasDef *_tao_impl = (POA_IR::AliasDef *) _tao_object_reference;
CORBA::Boolean _tao_retval = 0;
CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
ACE_THROW (CORBA::MARSHAL ());
--
-+
+
_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -16272,7 +16230,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -20624,21 +4220,8 @@
ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::AliasDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::WstringDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::AliasDef *_tao_impl = (POA_IR::AliasDef *) _tao_object_reference;
-+ POA_IR::WstringDef *_tao_impl = (POA_IR::WstringDef *) _tao_object_reference;
- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -16289,7 +16247,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -20646,37 +4229,7 @@
ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Boolean POA_IR::AliasDef::_is_a (
-+CORBA::Boolean POA_IR::WstringDef::_is_a (
- const 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/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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-@@ -16317,37 +10316,33 @@
- return 0;
- }
-
--void* POA_IR::AliasDef::_downcast (
-+void* POA_IR::WstringDef::_downcast (
- const char* logical_type_id
- )
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/AliasDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::AliasDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/TypedefDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::TypedefDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-- return ACE_static_cast (POA_IR::Contained_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/WstringDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::WstringDef_ptr, this);
+@@ -16323,7 +16281,7 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
return ACE_static_cast (POA_IR::IDLType_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
@@ -20685,1185 +4238,486 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
- }
-
--void POA_IR::AliasDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::WstringDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--const char* POA_IR::AliasDef::_interface_repository_id (void) const
-+const char* POA_IR::WstringDef::_interface_repository_id (void) const
- {
-- return "IDL:omg.org/IR/AliasDef:1.0";
-+ return "IDL:omg.org/IR/WstringDef:1.0";
- }
-
--IR::AliasDef*
--POA_IR::AliasDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+IR::WstringDef*
-+POA_IR::WstringDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-@@ -16360,264 +10355,102 @@
+@@ -16353,10 +16311,9 @@
ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
CORBA::Object_var obj = tmp;
- return ::IR::AliasDef::_unchecked_narrow (obj.in ());
--}
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::AliasDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
-+ return IR_WstringDef::_unchecked_narrow (obj.in ());
++ return IR_AliasDef::_unchecked_narrow (obj.in ());
}
--char *
--POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+class TAO_IR_FixedDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-
--void
--POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::result (IR::IDLType_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::AliasDef *tao_impl
-- ,
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -16436,7 +16393,7 @@
+ POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::AliasDef *tao_impl,
- IR::IDLType_ptr original_type_def,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- original_type_def_ (original_type_def)
--{}
--
--Dynamic::ParameterList *
--POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_original_type_def = parameter_list->length ();
-- parameter_list->length (length_original_type_def + 1);
-- (*parameter_list)[length_original_type_def].argument <<= this->original_type_def_;
--
-- (*parameter_list)[length_original_type_def].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_NativeDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
--{
--private:
-- unsigned int hash (const char *str, unsigned int len);
--public:
-- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
--};
--/* starting time is 16:31:12 */
--/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_NativeDef_Perfect_Hash_OpTable -N lookup */
--unsigned int
--TAO_IR_NativeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+private:
-+ unsigned int hash (const char *str, unsigned int len);
-+public:
-+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-+};
-+/* starting time is 11:23:10 */
-+/* C++ code produced by gperf version 2.8 (ACE version) */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FixedDef_Perfect_Hash_OpTable -N lookup */
-+unsigned int
-+TAO_IR_FixedDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
- static const unsigned char asso_values[] =
- {
- #if defined (ACE_MVS)
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 0, 0, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 0,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 0,
-+ 19, 19, 0, 0, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 0, 5, 19, 19, 19, 19, 0, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19,
- #else
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-- 0, 0, 37, 37, 37, 37, 37, 37, 37, 0,
-- 0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
-- 37, 10, 37, 37, 37, 37, 37, 37,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 0, 19, 0, 19, 19,
-+ 0, 0, 19, 19, 19, 19, 19, 19, 19, 19,
-+ 19, 19, 19, 19, 19, 0, 5, 19, 19, 19,
-+ 19, 0, 19, 19, 19, 19, 19, 19,
- #endif /* ACE_MVS */
- };
- return len + asso_values[str[len - 1]] + asso_values[str[0]];
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -16508,6 +16465,7 @@
}
- const class TAO_operation_db_entry *
--TAO_IR_NativeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+TAO_IR_FixedDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_NativeDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
- enum
- {
-- TOTAL_KEYWORDS = 16,
-- MIN_WORD_LENGTH = 4,
-- MAX_WORD_LENGTH = 26,
-- MIN_HASH_VALUE = 4,
-- MAX_HASH_VALUE = 36,
-- HASH_VALUE_RANGE = 33,
-- DUPLICATES = 5
-+ TOTAL_KEYWORDS = 9,
-+ MIN_WORD_LENGTH = 5,
-+ MAX_WORD_LENGTH = 13,
-+ MIN_HASH_VALUE = 5,
-+ MAX_HASH_VALUE = 18,
-+ HASH_VALUE_RANGE = 14,
-+ DUPLICATES = 3
- };
-
- static const class TAO_operation_db_entry wordlist[] =
- {
-- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::NativeDef::move_skel},
-- {"_is_a", &POA_IR::NativeDef::_is_a_skel},
-- {"_get_id", &POA_IR::NativeDef::_get_id_skel},
-- {"_set_id", &POA_IR::NativeDef::_set_id_skel},
-- {"describe", &POA_IR::NativeDef::describe_skel},
-- {"_get_name", &POA_IR::NativeDef::_get_name_skel},
-- {"_get_type", &POA_IR::NativeDef::_get_type_skel},
-- {"_set_name", &POA_IR::NativeDef::_set_name_skel},
-- {"_get_version", &POA_IR::NativeDef::_get_version_skel},
-- {"_set_version", &POA_IR::NativeDef::_set_version_skel},
-- {"_get_def_kind", &POA_IR::NativeDef::_get_def_kind_skel},
-- {"_get_defined_in", &POA_IR::NativeDef::_get_defined_in_skel},
-- {"destroy", &POA_IR::NativeDef::destroy_skel},
-- {"_get_absolute_name", &POA_IR::NativeDef::_get_absolute_name_skel},
-- {"_non_existent", &POA_IR::NativeDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::NativeDef::_get_containing_repository_skel},
-+ {"",0},{"",0},{"",0},{"",0},{"",0},
-+ {"_is_a", &POA_IR::FixedDef::_is_a_skel},
-+ {"destroy", &POA_IR::FixedDef::destroy_skel},
-+ {"_get_type", &POA_IR::FixedDef::_get_type_skel},
-+ {"_get_scale", &POA_IR::FixedDef::_get_scale_skel},
-+ {"_set_scale", &POA_IR::FixedDef::_set_scale_skel},
-+ {"_get_digits", &POA_IR::FixedDef::_get_digits_skel},
-+ {"_set_digits", &POA_IR::FixedDef::_set_digits_skel},
-+ {"_get_def_kind", &POA_IR::FixedDef::_get_def_kind_skel},
-+ {"_non_existent", &POA_IR::FixedDef::_non_existent_skel},
- };
-
- static const signed char lookup[] =
- {
-- -6, -2, -9, -3, 4, 5, -1, -43, 8, -43, -12, -2, -38, 14,
-- -1, 15, -1, 16, 17, -1, -1, -1, -1, 18, -1, -1, -1, -1,
-- -1, -1, -1, -1, -1, -1, -1, -1, 19,
-+ -1, -8, -2, -10, -2, 5, -1, 6, -1, 7, -27, -26, -1, 12,
-+ -1, -1, -1, -1, 13,
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -16651,38 +10484,37 @@
+ private:
+@@ -16515,7 +16473,7 @@
+ public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 18:47:28 */
++/* starting time is 11:23:10 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_NativeDef_Perfect_Hash_OpTable -N lookup */
+ unsigned int
+@@ -16642,10 +16600,9 @@
}
return 0;
}
--/* ending time is 16:31:12 */
--static TAO_IR_NativeDef_Perfect_Hash_OpTable tao_IR_NativeDef_optable;
--
+-/* ending time is 18:47:28 */
+/* ending time is 11:23:10 */
-+static TAO_IR_FixedDef_Perfect_Hash_OpTable tao_IR_FixedDef_optable;
+ static TAO_IR_NativeDef_Perfect_Hash_OpTable tao_IR_NativeDef_optable;
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Implementation
//
-
- // Factory function Implementation.
--POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker *POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::the_TAO_NativeDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker *POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::the_TAO_FixedDef_Strategized_Proxy_Broker (void)
- {
-- static POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ static POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker strategized_proxy_broker;
- return &strategized_proxy_broker;
- }
-
--POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::_TAO_NativeDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::_TAO_FixedDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- this->proxy_cache_[i] = 0;
-
- }
-
--POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::~_TAO_NativeDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::~_TAO_FixedDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- delete this->proxy_cache_[i];
+@@ -16671,9 +16628,9 @@
}
-IR::_TAO_NativeDef_Proxy_Impl&
--POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::select_proxy (
++_TAO_NativeDef_Proxy_Impl&
+ POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::select_proxy (
- ::IR::NativeDef *object,
-+_TAO_FixedDef_Proxy_Impl&
-+POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::select_proxy (
-+ IR_FixedDef *object,
++ IR_NativeDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -16700,7 +10532,7 @@
- }
-
- void
--POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::create_proxy (
-+POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::create_proxy (
- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -16714,7 +10546,7 @@
+@@ -16705,7 +16662,7 @@
case TAO_ORB_Core::THRU_POA_STRATEGY:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
- POA_IR::_TAO_NativeDef_ThruPOA_Proxy_Impl,
-+ _TAO_FixedDef_ThruPOA_Proxy_Impl,
++ _TAO_NativeDef_ThruPOA_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -16724,7 +10556,7 @@
+@@ -16715,7 +16672,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
- ::IR::_TAO_NativeDef_Remote_Proxy_Impl,
-+ _TAO_FixedDef_Remote_Proxy_Impl,
++ _TAO_NativeDef_Remote_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -16741,570 +10573,337 @@
+@@ -16732,26 +16689,26 @@
///////////////////////////////////////////////////////////////////////
-IR::_TAO_NativeDef_Proxy_Broker *
-IR__TAO_NativeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_FixedDef_Proxy_Broker *
-+_TAO_FixedDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
++_TAO_NativeDef_Proxy_Broker *
++_TAO_NativeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::the_TAO_NativeDef_Strategized_Proxy_Broker();
-+ return ::POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::the_TAO_FixedDef_Strategized_Proxy_Broker();
+ return ::POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::the_TAO_NativeDef_Strategized_Proxy_Broker();
}
int
-IR__TAO_NativeDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_FixedDef_Proxy_Broker_Factory_Initializer (long _dummy_)
++_TAO_NativeDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
ACE_UNUSED_ARG (_dummy_);
- IR__TAO_NativeDef_Proxy_Broker_Factory_function_pointer =
- IR__TAO_NativeDef_Proxy_Broker_Factory_function;
-+ _TAO_FixedDef_Proxy_Broker_Factory_function_pointer =
-+ _TAO_FixedDef_Proxy_Broker_Factory_function;
++ _TAO_NativeDef_Proxy_Broker_Factory_function_pointer =
++ _TAO_NativeDef_Proxy_Broker_Factory_function;
return 0;
}
-static int IR__TAO_NativeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- IR__TAO_NativeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_NativeDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_FixedDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-+ _TAO_FixedDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_FixedDef_Proxy_Broker_Factory_Initializer));
++static int _TAO_NativeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
++ _TAO_NativeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_NativeDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
- // ThruPOA Proxy Implementation
- //
-
--POA_IR::_TAO_NativeDef_ThruPOA_Proxy_Impl::_TAO_NativeDef_ThruPOA_Proxy_Impl (void)
-+POA_IR::_TAO_FixedDef_ThruPOA_Proxy_Impl::_TAO_FixedDef_ThruPOA_Proxy_Impl (void)
- {}
-
--// ThruPOA Implementation of the IDL interface methods
--
--//
--// End ThruPOA Proxy Implementation
--///////////////////////////////////////////////////////////////////////
--
--// skeleton constructor
--POA_IR::NativeDef::NativeDef (void)
--{
-- this->optable_ = &tao_IR_NativeDef_optable;
--}
--
--// copy ctor
--POA_IR::NativeDef::NativeDef (const NativeDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,TypedefDef) (rhs),
-- ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-- ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+@@ -16778,7 +16735,7 @@
+ : ACE_NESTED_CLASS (POA_IR,TypedefDef) (rhs),
+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-- TAO_ServantBase (rhs)
-+POA_IR::_TAO_FixedDef_ThruPOA_Proxy_Impl::~_TAO_FixedDef_ThruPOA_Proxy_Impl (void)
++ POA_CORBA_IRObject (rhs),
+ TAO_ServantBase (rhs)
{}
--// skeleton destructor
--POA_IR::NativeDef::~NativeDef (void)
--{
--}
--
--void POA_IR::NativeDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::NativeDef *_tao_impl = (POA_IR::NativeDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = 0;
-- CORBA::String_var value;
+@@ -16798,7 +16755,7 @@
+ POA_IR::NativeDef *_tao_impl = (POA_IR::NativeDef *) _tao_object_reference;
+ CORBA::Boolean _tao_retval = 0;
+ CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
-- ACE_THROW (CORBA::MARSHAL ());
--
-- _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
++ if (!((_tao_in >> value.out ())))
+ ACE_THROW (CORBA::MARSHAL ());
+
+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+@@ -16806,7 +16763,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
--}
-+// ThruPOA Implementation of the IDL interface methods
-
--void POA_IR::NativeDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-+CORBA::UShort POA_IR::_TAO_FixedDef_ThruPOA_Proxy_Impl::digits (
-+ CORBA_Object *_collocated_tao_target_,
- CORBA::Environment &ACE_TRY_ENV
- )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- POA_IR::NativeDef *_tao_impl = (POA_IR::NativeDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
++ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
+ ACE_THROW (CORBA::MARSHAL ());
+ }
+
+@@ -16823,7 +16780,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
-+ CORBA::UShort _tao_retval = 0;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "digits",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (_tao_retval);
-+ return ACE_reinterpret_cast (
-+ POA_IR::FixedDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/FixedDef:1.0"
-+ )
-+ )->digits (
-+ ACE_TRY_ENV
-+ );
++ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
+ ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Boolean POA_IR::NativeDef::_is_a (
-- const char* value,
-+void POA_IR::_TAO_FixedDef_ThruPOA_Proxy_Impl::digits (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::UShort digits,
- CORBA::Environment &ACE_TRY_ENV
- )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- if (
-- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/NativeDef: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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-- return 1;
-- else
-- return 0;
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "digits",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::FixedDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/FixedDef:1.0"
-+ )
-+ )->digits (
-+ digits,
-+ ACE_TRY_ENV
-+ );
-+ return;
- }
-
--void* POA_IR::NativeDef::_downcast (
-- const char* logical_type_id
-+CORBA::Short POA_IR::_TAO_FixedDef_ThruPOA_Proxy_Impl::scale (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
- )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/NativeDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::NativeDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/TypedefDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::TypedefDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-- return ACE_static_cast (POA_IR::Contained_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-- return ACE_static_cast (POA_IR::IDLType_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+@@ -16857,7 +16814,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
+ return ACE_static_cast (POA_IR::IDLType_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-- return ACE_static_cast(PortableServer::Servant, this);
-- return 0;
-+ CORBA::Short _tao_retval = 0;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "scale",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (_tao_retval);
-+ return ACE_reinterpret_cast (
-+ POA_IR::FixedDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/FixedDef:1.0"
-+ )
-+ )->scale (
-+ ACE_TRY_ENV
-+ );
- }
-
--void POA_IR::NativeDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::_TAO_FixedDef_ThruPOA_Proxy_Impl::scale (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Short scale,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "scale",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::FixedDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/FixedDef:1.0"
-+ )
-+ )->scale (
-+ scale,
-+ ACE_TRY_ENV
-+ );
-+ return;
++ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+ return ACE_static_cast(PortableServer::Servant, this);
+ return 0;
+@@ -16887,12 +16844,12 @@
+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
+
+ CORBA::Object_var obj = tmp;
+- return ::IR::NativeDef::_unchecked_narrow (obj.in ());
++ return IR_NativeDef::_unchecked_narrow (obj.in ());
}
--const char* POA_IR::NativeDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/NativeDef:1.0";
--}
-+//
-+// End ThruPOA Proxy Implementation
-+///////////////////////////////////////////////////////////////////////
-
--IR::NativeDef*
--POA_IR::NativeDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+// skeleton constructor
-+POA_IR::FixedDef::FixedDef (void)
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_PrimitiveDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
-- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Object_ptr tmp = CORBA::Object::_nil ();
--
-- if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-- else
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
--
-- CORBA::Object_var obj = tmp;
-- return ::IR::NativeDef::_unchecked_narrow (obj.in ());
-+ this->optable_ = &tao_IR_FixedDef_optable;
+ private:
+@@ -16900,7 +16857,7 @@
+ public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 18:47:28 */
++/* starting time is 11:23:10 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PrimitiveDef_Perfect_Hash_OpTable -N lookup */
+ unsigned int
+@@ -16997,10 +16954,9 @@
+ }
+ return 0;
}
+-/* ending time is 18:47:28 */
++/* ending time is 11:23:10 */
+ static TAO_IR_PrimitiveDef_Perfect_Hash_OpTable tao_IR_PrimitiveDef_optable;
-+// copy ctor
-+POA_IR::FixedDef::FixedDef (const FixedDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
-+ POA_CORBA_IRObject (rhs),
-+ TAO_ServantBase (rhs)
-+{}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_PrimitiveDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
--{
--private:
-- unsigned int hash (const char *str, unsigned int len);
--public:
-- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
--};
--/* starting time is 16:31:12 */
--/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PrimitiveDef_Perfect_Hash_OpTable -N lookup */
--unsigned int
--TAO_IR_PrimitiveDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+// skeleton destructor
-+POA_IR::FixedDef::~FixedDef (void)
- {
-- static const unsigned char asso_values[] =
-- {
--#if defined (ACE_MVS)
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 0,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 0,
-- 19, 19, 0, 5, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 5, 19, 19, 19, 19, 0, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19,
--#else
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 0, 19, 0, 19, 19,
-- 0, 5, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 5, 19, 19, 19,
-- 19, 0, 19, 19, 19, 19, 19, 19,
--#endif /* ACE_MVS */
-- };
-- return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
--const class TAO_operation_db_entry *
--TAO_IR_PrimitiveDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+void POA_IR::FixedDef::_get_digits_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- enum
-- {
-- TOTAL_KEYWORDS = 6,
-- MIN_WORD_LENGTH = 5,
-- MAX_WORD_LENGTH = 13,
-- MIN_HASH_VALUE = 5,
-- MAX_HASH_VALUE = 18,
-- HASH_VALUE_RANGE = 14,
-- DUPLICATES = 0
-- };
-+ POA_IR::FixedDef *_tao_impl = (POA_IR::FixedDef *)_tao_object_reference;
-
-- static const class TAO_operation_db_entry wordlist[] =
-- {
-- {"",0},{"",0},{"",0},{"",0},{"",0},
-- {"_is_a", &POA_IR::PrimitiveDef::_is_a_skel},
-- {"",0},
-- {"destroy", &POA_IR::PrimitiveDef::destroy_skel},
-- {"",0},
-- {"_get_kind", &POA_IR::PrimitiveDef::_get_kind_skel},
-- {"",0},{"",0},{"",0},
-- {"_get_def_kind", &POA_IR::PrimitiveDef::_get_def_kind_skel},
-- {"_get_type", &POA_IR::PrimitiveDef::_get_type_skel},
-- {"",0},{"",0},{"",0},
-- {"_non_existent", &POA_IR::PrimitiveDef::_non_existent_skel},
-- };
-+ CORBA::UShort _tao_retval = 0;
-
-- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-- {
-- unsigned int key = hash (str, len);
-+ _tao_retval = _tao_impl->digits (
-+ ACE_TRY_ENV
-+ );
-
-- if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-- {
-- const char *s = wordlist[key].opname_;
-+ ACE_CHECK;
-
-- if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-- return &wordlist[key];
-- }
-- }
-- return 0;
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
--/* ending time is 16:31:12 */
--static TAO_IR_PrimitiveDef_Perfect_Hash_OpTable tao_IR_PrimitiveDef_optable;
--
--
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Implementation
--//
-
--// Factory function Implementation.
--POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker *POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::the_TAO_PrimitiveDef_Strategized_Proxy_Broker (void)
-+void POA_IR::FixedDef::_set_digits_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- static POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker strategized_proxy_broker;
-- return &strategized_proxy_broker;
--}
--
--POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::_TAO_PrimitiveDef_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- this->proxy_cache_[i] = 0;
--
--}
--
--POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::~_TAO_PrimitiveDef_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- delete this->proxy_cache_[i];
--
--}
-
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Implementation
+ //
+@@ -17026,9 +16982,9 @@
+
+ }
+
-IR::_TAO_PrimitiveDef_Proxy_Impl&
--POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::select_proxy (
++_TAO_PrimitiveDef_Proxy_Impl&
+ POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::select_proxy (
- ::IR::PrimitiveDef *object,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-- TAO_ORB_Core::collocation_strategy (object);
--
-- if (this->proxy_cache_[strategy] != 0)
-- return *this->proxy_cache_[strategy];
--
-- this->create_proxy (strategy, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
--
-- return *this->proxy_cache_[strategy];
--
--}
--
--void
--POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::create_proxy (
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
--
-- if (this->proxy_cache_[strategy] == 0)
-- {
-- switch (strategy)
-- {
-- case TAO_ORB_Core::THRU_POA_STRATEGY:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
++ IR_PrimitiveDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -17060,7 +17016,7 @@
+ case TAO_ORB_Core::THRU_POA_STRATEGY:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
- POA_IR::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- case TAO_ORB_Core::REMOTE_STRATEGY:
-- default:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
++ _TAO_PrimitiveDef_ThruPOA_Proxy_Impl,
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -17070,7 +17026,7 @@
+ default:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
- ::IR::_TAO_PrimitiveDef_Remote_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- }
--
-- }
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::FixedDef *_tao_impl = (POA_IR::FixedDef *)_tao_object_reference;
-
-+ CORBA::UShort digits;
-+ if (!(
-+ (_tao_in >> digits)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--//
--// End Strategized Proxy Broker Implementation
--///////////////////////////////////////////////////////////////////////
-+ _tao_impl->digits (
-+ digits,
-+ ACE_TRY_ENV
-+ );
++ _TAO_PrimitiveDef_Remote_Proxy_Impl,
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -17087,26 +17043,26 @@
+ ///////////////////////////////////////////////////////////////////////
-+ ACE_CHECK;
-IR::_TAO_PrimitiveDef_Proxy_Broker *
-IR__TAO_PrimitiveDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
--{
-- ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::the_TAO_PrimitiveDef_Strategized_Proxy_Broker();
-+ _tao_server_request.init_reply ();
++_TAO_PrimitiveDef_Proxy_Broker *
++_TAO_PrimitiveDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+ {
+ ACE_UNUSED_ARG (obj);
+ return ::POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::the_TAO_PrimitiveDef_Strategized_Proxy_Broker();
}
--int
+ int
-IR__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+void POA_IR::FixedDef::_get_scale_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- ACE_UNUSED_ARG (_dummy_);
--
++_TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+ {
+ ACE_UNUSED_ARG (_dummy_);
+
- IR__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer =
- IR__TAO_PrimitiveDef_Proxy_Broker_Factory_function;
--
-- return 0;
--}
--
++ _TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer =
++ _TAO_PrimitiveDef_Proxy_Broker_Factory_function;
+
+ return 0;
+ }
+
-static int IR__TAO_PrimitiveDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
- IR__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer));
--
--
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Proxy Implementation
--//
--
--POA_IR::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl (void)
--{}
-+ POA_IR::FixedDef *_tao_impl = (POA_IR::FixedDef *)_tao_object_reference;
++static int _TAO_PrimitiveDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
++ _TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer));
+
+
+ ///////////////////////////////////////////////////////////////////////
+@@ -17118,7 +17074,7 @@
--// ThruPOA Implementation of the IDL interface methods
-+ CORBA::Short _tao_retval = 0;
+ // ThruPOA Implementation of the IDL interface methods
-IR::PrimitiveKind POA_IR::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::kind (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
++IR_PrimitiveKind POA_IR::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::kind (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -17126,7 +17082,7 @@
+ CORBA::SystemException
+ ))
+ {
- IR::PrimitiveKind _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "kind",
-- forward_to.out (),
-+ _tao_retval = _tao_impl->scale (
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (_tao_retval);
-- return ACE_reinterpret_cast (
-- POA_IR::PrimitiveDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/PrimitiveDef:1.0"
-- )
-- )->kind (
-- ACE_TRY_ENV
-- );
--}
--
--//
--// End ThruPOA Proxy Implementation
--///////////////////////////////////////////////////////////////////////
--
--// skeleton constructor
--POA_IR::PrimitiveDef::PrimitiveDef (void)
--{
-- this->optable_ = &tao_IR_PrimitiveDef_optable;
--}
-
--// copy ctor
--POA_IR::PrimitiveDef::PrimitiveDef (const PrimitiveDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
++ IR_PrimitiveKind _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -17162,7 +17118,7 @@
+ // copy ctor
+ POA_IR::PrimitiveDef::PrimitiveDef (const PrimitiveDef& rhs)
+ : ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-- TAO_ServantBase (rhs)
--{}
-+ ACE_CHECK;
++ POA_CORBA_IRObject (rhs),
+ TAO_ServantBase (rhs)
+ {}
--// skeleton destructor
--POA_IR::PrimitiveDef::~PrimitiveDef (void)
--{
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
+@@ -17180,7 +17136,7 @@
+ {
+ POA_IR::PrimitiveDef *_tao_impl = (POA_IR::PrimitiveDef *)_tao_object_reference;
+
+- IR::PrimitiveKind _tao_retval;
++ IR_PrimitiveKind _tao_retval;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -17207,7 +17163,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::PrimitiveKind _tao_retval_info = _tao_retval;
++ IR_PrimitiveKind _tao_retval_info = _tao_retval;
+ ri.result (_tao_retval_info);
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+ _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+@@ -17261,7 +17217,7 @@
+ POA_IR::PrimitiveDef *_tao_impl = (POA_IR::PrimitiveDef *) _tao_object_reference;
+ CORBA::Boolean _tao_retval = 0;
+ CORBA::String_var value;
+- if (!(_tao_in >> value.out ()))
++ if (!((_tao_in >> value.out ())))
+ ACE_THROW (CORBA::MARSHAL ());
+
+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+@@ -17269,7 +17225,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
++ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
+ ACE_THROW (CORBA::MARSHAL ());
+ }
+
+@@ -17286,7 +17242,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
++ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
+ ACE_THROW (CORBA::MARSHAL ());
+ }
+
+@@ -17314,7 +17270,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
+ return ACE_static_cast (POA_IR::IDLType_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
++ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+ return ACE_static_cast(PortableServer::Servant, this);
+ return 0;
+@@ -17344,10 +17300,9 @@
+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
+
+ CORBA::Object_var obj = tmp;
+- return ::IR::PrimitiveDef::_unchecked_narrow (obj.in ());
++ return IR_PrimitiveDef::_unchecked_narrow (obj.in ());
}
--void POA_IR::PrimitiveDef::_get_kind_skel (
-+void POA_IR::FixedDef::_set_scale_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- POA_IR::PrimitiveDef *_tao_impl = (POA_IR::PrimitiveDef *)_tao_object_reference;
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::FixedDef *_tao_impl = (POA_IR::FixedDef *)_tao_object_reference;
-
-- IR::PrimitiveKind _tao_retval;
-+ CORBA::Short scale;
-+ if (!(
-+ (_tao_in >> scale)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_impl->scale (
-+ scale,
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
-
-- _tao_impl->kind (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::PrimitiveKind _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -17425,6 +17380,7 @@
+ }
+
+ #endif /* TAO_HAS_INTERCEPTORS */
+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
+ class TAO_IR_StringDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+ {
+ private:
+@@ -17432,7 +17388,7 @@
+ public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 18:47:28 */
++/* starting time is 11:23:10 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_StringDef_Perfect_Hash_OpTable -N lookup */
+ unsigned int
+@@ -17549,10 +17505,9 @@
+ }
+ return 0;
+ }
+-/* ending time is 18:47:28 */
++/* ending time is 11:23:10 */
+ static TAO_IR_StringDef_Perfect_Hash_OpTable tao_IR_StringDef_optable;
-+ _tao_server_request.init_reply ();
+-
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Implementation
+ //
+@@ -17578,9 +17533,9 @@
+
}
--void POA_IR::PrimitiveDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::FixedDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
+-IR::_TAO_StringDef_Proxy_Impl&
++_TAO_StringDef_Proxy_Impl&
+ POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::StringDef *object,
++ IR_StringDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
+@@ -17612,7 +17567,7 @@
+ case TAO_ORB_Core::THRU_POA_STRATEGY:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- POA_IR::_TAO_StringDef_ThruPOA_Proxy_Impl,
++ _TAO_StringDef_ThruPOA_Proxy_Impl,
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -17622,7 +17577,7 @@
+ default:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- ::IR::_TAO_StringDef_Remote_Proxy_Impl,
++ _TAO_StringDef_Remote_Proxy_Impl,
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -17639,26 +17594,26 @@
+ ///////////////////////////////////////////////////////////////////////
+
+
+-IR::_TAO_StringDef_Proxy_Broker *
+-IR__TAO_StringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
++_TAO_StringDef_Proxy_Broker *
++_TAO_StringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+ {
+ ACE_UNUSED_ARG (obj);
+ return ::POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::the_TAO_StringDef_Strategized_Proxy_Broker();
+ }
+
+ int
+-IR__TAO_StringDef_Proxy_Broker_Factory_Initializer (long _dummy_)
++_TAO_StringDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+ {
+ ACE_UNUSED_ARG (_dummy_);
+
+- IR__TAO_StringDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_StringDef_Proxy_Broker_Factory_function;
++ _TAO_StringDef_Proxy_Broker_Factory_function_pointer =
++ _TAO_StringDef_Proxy_Broker_Factory_function;
+
+ return 0;
+ }
+
+-static int IR__TAO_StringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_StringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_StringDef_Proxy_Broker_Factory_Initializer));
++static int _TAO_StringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
++ _TAO_StringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_StringDef_Proxy_Broker_Factory_Initializer));
+
+
+ ///////////////////////////////////////////////////////////////////////
+@@ -17746,7 +17701,7 @@
+ // copy ctor
+ POA_IR::StringDef::StringDef (const StringDef& rhs)
+ : ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
++ POA_CORBA_IRObject (rhs),
+ TAO_ServantBase (rhs)
+ {}
+
+@@ -17844,14 +17799,12 @@
TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::PrimitiveDef *_tao_impl = (POA_IR::PrimitiveDef *) _tao_object_reference;
-+ POA_IR::FixedDef *_tao_impl = (POA_IR::FixedDef *) _tao_object_reference;
+ POA_IR::StringDef *_tao_impl = (POA_IR::StringDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+ CORBA::ULong bound;
+ if (!(
+ (_tao_in >> bound)
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -17924,7 +17877,7 @@
+ POA_IR::StringDef *_tao_impl = (POA_IR::StringDef *) _tao_object_reference;
CORBA::Boolean _tao_retval = 0;
CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
ACE_THROW (CORBA::MARSHAL ());
--
-+
+
_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -17932,7 +17885,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -21871,21 +4725,8 @@
ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::PrimitiveDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::FixedDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::PrimitiveDef *_tao_impl = (POA_IR::PrimitiveDef *) _tao_object_reference;
-+ POA_IR::FixedDef *_tao_impl = (POA_IR::FixedDef *) _tao_object_reference;
- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -17949,7 +17902,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -21893,31 +4734,7 @@
ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Boolean POA_IR::PrimitiveDef::_is_a (
-+CORBA::Boolean POA_IR::FixedDef::_is_a (
- const 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/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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-@@ -17313,33 +10912,33 @@
- return 0;
- }
-
--void* POA_IR::PrimitiveDef::_downcast (
-+void* POA_IR::FixedDef::_downcast (
- const char* logical_type_id
- )
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/PrimitiveDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::PrimitiveDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/FixedDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::FixedDef_ptr, this);
+@@ -17977,7 +17930,7 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
return ACE_static_cast (POA_IR::IDLType_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
@@ -21926,831 +4743,552 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
+@@ -18007,10 +17960,9 @@
+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
+
+ CORBA::Object_var obj = tmp;
+- return ::IR::StringDef::_unchecked_narrow (obj.in ());
++ return IR_StringDef::_unchecked_narrow (obj.in ());
+ }
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::TAO_ServerRequestInfo_IR_StringDef_bound_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -18161,6 +18113,7 @@
}
--void POA_IR::PrimitiveDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::FixedDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_WstringDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
+ private:
+@@ -18168,7 +18121,7 @@
+ public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 18:47:28 */
++/* starting time is 11:23:10 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_WstringDef_Perfect_Hash_OpTable -N lookup */
+ unsigned int
+@@ -18285,10 +18238,9 @@
+ }
+ return 0;
}
+-/* ending time is 18:47:28 */
++/* ending time is 11:23:10 */
+ static TAO_IR_WstringDef_Perfect_Hash_OpTable tao_IR_WstringDef_optable;
+
+-
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Implementation
+ //
+@@ -18314,9 +18266,9 @@
+
+ }
+
+-IR::_TAO_WstringDef_Proxy_Impl&
++_TAO_WstringDef_Proxy_Impl&
+ POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::WstringDef *object,
++ IR_WstringDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -18348,7 +18300,7 @@
+ case TAO_ORB_Core::THRU_POA_STRATEGY:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- POA_IR::_TAO_WstringDef_ThruPOA_Proxy_Impl,
++ _TAO_WstringDef_ThruPOA_Proxy_Impl,
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -18358,7 +18310,7 @@
+ default:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- ::IR::_TAO_WstringDef_Remote_Proxy_Impl,
++ _TAO_WstringDef_Remote_Proxy_Impl,
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -18375,26 +18327,26 @@
+ ///////////////////////////////////////////////////////////////////////
--const char* POA_IR::PrimitiveDef::_interface_repository_id (void) const
-+const char* POA_IR::FixedDef::_interface_repository_id (void) const
+
+-IR::_TAO_WstringDef_Proxy_Broker *
+-IR__TAO_WstringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
++_TAO_WstringDef_Proxy_Broker *
++_TAO_WstringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
-- return "IDL:omg.org/IR/PrimitiveDef:1.0";
-+ return "IDL:omg.org/IR/FixedDef:1.0";
+ ACE_UNUSED_ARG (obj);
+ return ::POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::the_TAO_WstringDef_Strategized_Proxy_Broker();
}
--IR::PrimitiveDef*
--POA_IR::PrimitiveDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+IR::FixedDef*
-+POA_IR::FixedDef::_this (CORBA_Environment &ACE_TRY_ENV)
+ int
+-IR__TAO_WstringDef_Proxy_Broker_Factory_Initializer (long _dummy_)
++_TAO_WstringDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-@@ -17352,179 +10951,103 @@
+ ACE_UNUSED_ARG (_dummy_);
+
+- IR__TAO_WstringDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_WstringDef_Proxy_Broker_Factory_function;
++ _TAO_WstringDef_Proxy_Broker_Factory_function_pointer =
++ _TAO_WstringDef_Proxy_Broker_Factory_function;
+
+ return 0;
+ }
+
+-static int IR__TAO_WstringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_WstringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_WstringDef_Proxy_Broker_Factory_Initializer));
++static int _TAO_WstringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
++ _TAO_WstringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_WstringDef_Proxy_Broker_Factory_Initializer));
+
+
+ ///////////////////////////////////////////////////////////////////////
+@@ -18482,7 +18434,7 @@
+ // copy ctor
+ POA_IR::WstringDef::WstringDef (const WstringDef& rhs)
+ : ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
++ POA_CORBA_IRObject (rhs),
+ TAO_ServantBase (rhs)
+ {}
+
+@@ -18580,14 +18532,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::WstringDef *_tao_impl = (POA_IR::WstringDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+ CORBA::ULong bound;
+ if (!(
+ (_tao_in >> bound)
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -18660,7 +18610,7 @@
+ POA_IR::WstringDef *_tao_impl = (POA_IR::WstringDef *) _tao_object_reference;
+ CORBA::Boolean _tao_retval = 0;
+ CORBA::String_var value;
+- if (!(_tao_in >> value.out ()))
++ if (!((_tao_in >> value.out ())))
+ ACE_THROW (CORBA::MARSHAL ());
+
+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+@@ -18668,7 +18618,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
++ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
+ ACE_THROW (CORBA::MARSHAL ());
+ }
+
+@@ -18685,7 +18635,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
++ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
+ ACE_THROW (CORBA::MARSHAL ());
+ }
+
+@@ -18713,7 +18663,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
+ return ACE_static_cast (POA_IR::IDLType_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
++ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+ return ACE_static_cast(PortableServer::Servant, this);
+ return 0;
+@@ -18743,10 +18693,9 @@
ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
CORBA::Object_var obj = tmp;
-- return ::IR::PrimitiveDef::_unchecked_narrow (obj.in ());
--}
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::PrimitiveDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
+- return ::IR::WstringDef::_unchecked_narrow (obj.in ());
++ return IR_WstringDef::_unchecked_narrow (obj.in ());
+ }
+
-
--void
--POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::result (IR::PrimitiveKind result)
--{
-- // Update the result.
-- this->_result = result;
-+ return IR_FixedDef::_unchecked_narrow (obj.in ());
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::TAO_ServerRequestInfo_IR_WstringDef_bound_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -18897,6 +18846,7 @@
}
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_StringDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+class TAO_IR_SequenceDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_FixedDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
private:
- unsigned int hash (const char *str, unsigned int len);
+@@ -18904,7 +18854,7 @@
public:
const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
};
--/* starting time is 16:31:12 */
+-/* starting time is 18:47:28 */
+/* starting time is 11:23:10 */
/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_StringDef_Perfect_Hash_OpTable -N lookup */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_SequenceDef_Perfect_Hash_OpTable -N lookup */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FixedDef_Perfect_Hash_OpTable -N lookup */
unsigned int
--TAO_IR_StringDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+TAO_IR_SequenceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
- static const unsigned char asso_values[] =
- {
- #if defined (ACE_MVS)
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 0,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 0,
-- 19, 19, 0, 0, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 5, 19, 19, 19, 19, 0, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 0,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 0,
-+ 22, 22, 0, 0, 0, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 5, 22, 22, 22, 22, 0, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22,
- #else
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 0, 19, 0, 19, 19,
-- 0, 0, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 5, 19, 19, 19,
-- 19, 0, 19, 19, 19, 19, 19, 19,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 0, 22, 0, 22, 22,
-+ 0, 0, 0, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 5, 22, 22, 22,
-+ 22, 0, 22, 22, 22, 22, 22, 22,
- #endif /* ACE_MVS */
- };
- return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
- const class TAO_operation_db_entry *
--TAO_IR_StringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+TAO_IR_SequenceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
- enum
- {
-- TOTAL_KEYWORDS = 7,
-+ TOTAL_KEYWORDS = 10,
- MIN_WORD_LENGTH = 5,
-- MAX_WORD_LENGTH = 13,
-+ MAX_WORD_LENGTH = 21,
- MIN_HASH_VALUE = 5,
-- MAX_HASH_VALUE = 18,
-- HASH_VALUE_RANGE = 14,
-- DUPLICATES = 2
-+ MAX_HASH_VALUE = 21,
-+ HASH_VALUE_RANGE = 17,
-+ DUPLICATES = 3
- };
-
- static const class TAO_operation_db_entry wordlist[] =
- {
- {"",0},{"",0},{"",0},{"",0},{"",0},
-- {"_is_a", &POA_IR::StringDef::_is_a_skel},
-- {"destroy", &POA_IR::StringDef::destroy_skel},
-- {"_get_type", &POA_IR::StringDef::_get_type_skel},
-- {"_get_bound", &POA_IR::StringDef::_get_bound_skel},
-- {"_set_bound", &POA_IR::StringDef::_set_bound_skel},
-- {"_get_def_kind", &POA_IR::StringDef::_get_def_kind_skel},
-- {"_non_existent", &POA_IR::StringDef::_non_existent_skel},
-+ {"_is_a", &POA_IR::SequenceDef::_is_a_skel},
-+ {"destroy", &POA_IR::SequenceDef::destroy_skel},
-+ {"_get_type", &POA_IR::SequenceDef::_get_type_skel},
-+ {"_get_bound", &POA_IR::SequenceDef::_get_bound_skel},
-+ {"_set_bound", &POA_IR::SequenceDef::_set_bound_skel},
-+ {"_get_def_kind", &POA_IR::SequenceDef::_get_def_kind_skel},
-+ {"_get_element_type", &POA_IR::SequenceDef::_get_element_type_skel},
-+ {"_non_existent", &POA_IR::SequenceDef::_non_existent_skel},
-+ {"_get_element_type_def", &POA_IR::SequenceDef::_get_element_type_def_skel},
-+ {"_set_element_type_def", &POA_IR::SequenceDef::_set_element_type_def_skel},
- };
-
- static const signed char lookup[] =
- {
-- -1, -1, -1, -8, -2, 5, -1, 6, -1, 7, -25, -1, -1, 10,
-- -1, -1, -1, -1, 11,
-+ -1, -1, -1, -8, -2, 5, -1, 6, -1, 7, -28, -1, -1, 10,
-+ -1, -1, -1, 11, 12, -13, -2, -23,
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -17558,38 +11081,37 @@
+@@ -19023,10 +18973,9 @@
}
return 0;
}
--/* ending time is 16:31:12 */
--static TAO_IR_StringDef_Perfect_Hash_OpTable tao_IR_StringDef_optable;
--
+-/* ending time is 18:47:28 */
+/* ending time is 11:23:10 */
-+static TAO_IR_SequenceDef_Perfect_Hash_OpTable tao_IR_SequenceDef_optable;
+ static TAO_IR_FixedDef_Perfect_Hash_OpTable tao_IR_FixedDef_optable;
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Implementation
//
+@@ -19052,9 +19001,9 @@
+
+ }
- // Factory function Implementation.
--POA_IR::_TAO_StringDef_Strategized_Proxy_Broker *POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::the_TAO_StringDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker *POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::the_TAO_SequenceDef_Strategized_Proxy_Broker (void)
+-IR::_TAO_FixedDef_Proxy_Impl&
++_TAO_FixedDef_Proxy_Impl&
+ POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::FixedDef *object,
++ IR_FixedDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
-- static POA_IR::_TAO_StringDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ static POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker strategized_proxy_broker;
- return &strategized_proxy_broker;
+@@ -19086,7 +19035,7 @@
+ case TAO_ORB_Core::THRU_POA_STRATEGY:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- POA_IR::_TAO_FixedDef_ThruPOA_Proxy_Impl,
++ _TAO_FixedDef_ThruPOA_Proxy_Impl,
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -19096,7 +19045,7 @@
+ default:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- ::IR::_TAO_FixedDef_Remote_Proxy_Impl,
++ _TAO_FixedDef_Remote_Proxy_Impl,
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -19113,26 +19062,26 @@
+ ///////////////////////////////////////////////////////////////////////
+
+
+-IR::_TAO_FixedDef_Proxy_Broker *
+-IR__TAO_FixedDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
++_TAO_FixedDef_Proxy_Broker *
++_TAO_FixedDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+ {
+ ACE_UNUSED_ARG (obj);
+ return ::POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::the_TAO_FixedDef_Strategized_Proxy_Broker();
}
--POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::_TAO_StringDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::_TAO_SequenceDef_Strategized_Proxy_Broker (void)
+ int
+-IR__TAO_FixedDef_Proxy_Broker_Factory_Initializer (long _dummy_)
++_TAO_FixedDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- this->proxy_cache_[i] = 0;
+ ACE_UNUSED_ARG (_dummy_);
+
+- IR__TAO_FixedDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_FixedDef_Proxy_Broker_Factory_function;
++ _TAO_FixedDef_Proxy_Broker_Factory_function_pointer =
++ _TAO_FixedDef_Proxy_Broker_Factory_function;
+
+ return 0;
+ }
+
+-static int IR__TAO_FixedDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_FixedDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_FixedDef_Proxy_Broker_Factory_Initializer));
++static int _TAO_FixedDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
++ _TAO_FixedDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_FixedDef_Proxy_Broker_Factory_Initializer));
+
+
+ ///////////////////////////////////////////////////////////////////////
+@@ -19283,7 +19232,7 @@
+ // copy ctor
+ POA_IR::FixedDef::FixedDef (const FixedDef& rhs)
+ : ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
++ POA_CORBA_IRObject (rhs),
+ TAO_ServantBase (rhs)
+ {}
+
+@@ -19381,14 +19330,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::FixedDef *_tao_impl = (POA_IR::FixedDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+ CORBA::UShort digits;
+ if (!(
+ (_tao_in >> digits)
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -19539,14 +19486,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::FixedDef *_tao_impl = (POA_IR::FixedDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+ CORBA::Short scale;
+ if (!(
+ (_tao_in >> scale)
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -19619,7 +19564,7 @@
+ POA_IR::FixedDef *_tao_impl = (POA_IR::FixedDef *) _tao_object_reference;
+ CORBA::Boolean _tao_retval = 0;
+ CORBA::String_var value;
+- if (!(_tao_in >> value.out ()))
++ if (!((_tao_in >> value.out ())))
+ ACE_THROW (CORBA::MARSHAL ());
+
+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+@@ -19627,7 +19572,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
++ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
+ ACE_THROW (CORBA::MARSHAL ());
+ }
+
+@@ -19644,7 +19589,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
++ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
+ ACE_THROW (CORBA::MARSHAL ());
+ }
+
+@@ -19672,7 +19617,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
+ return ACE_static_cast (POA_IR::IDLType_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
++ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+ return ACE_static_cast(PortableServer::Servant, this);
+ return 0;
+@@ -19702,10 +19647,9 @@
+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
+ CORBA::Object_var obj = tmp;
+- return ::IR::FixedDef::_unchecked_narrow (obj.in ());
++ return IR_FixedDef::_unchecked_narrow (obj.in ());
+ }
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::TAO_ServerRequestInfo_IR_FixedDef_digits_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -20004,6 +19948,7 @@
}
--POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::~_TAO_StringDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::~_TAO_SequenceDef_Strategized_Proxy_Broker (void)
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_SequenceDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- delete this->proxy_cache_[i];
+ private:
+@@ -20011,7 +19956,7 @@
+ public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 18:47:28 */
++/* starting time is 11:23:10 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_SequenceDef_Perfect_Hash_OpTable -N lookup */
+ unsigned int
+@@ -20131,10 +20076,9 @@
+ }
+ return 0;
+ }
+-/* ending time is 18:47:28 */
++/* ending time is 11:23:10 */
+ static TAO_IR_SequenceDef_Perfect_Hash_OpTable tao_IR_SequenceDef_optable;
+
+-
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Implementation
+ //
+@@ -20160,9 +20104,9 @@
}
--IR::_TAO_StringDef_Proxy_Impl&
--POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::StringDef *object,
+-IR::_TAO_SequenceDef_Proxy_Impl&
+_TAO_SequenceDef_Proxy_Impl&
-+POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::select_proxy (
+ POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::SequenceDef *object,
+ IR_SequenceDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -17607,7 +11129,7 @@
- }
-
- void
--POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::create_proxy (
-+POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::create_proxy (
- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -17621,7 +11143,7 @@
+@@ -20194,7 +20138,7 @@
case TAO_ORB_Core::THRU_POA_STRATEGY:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
-- POA_IR::_TAO_StringDef_ThruPOA_Proxy_Impl,
+- POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl,
+ _TAO_SequenceDef_ThruPOA_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -17631,7 +11153,7 @@
+@@ -20204,7 +20148,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
-- ::IR::_TAO_StringDef_Remote_Proxy_Impl,
+- ::IR::_TAO_SequenceDef_Remote_Proxy_Impl,
+ _TAO_SequenceDef_Remote_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -17648,38 +11170,41 @@
+@@ -20221,26 +20165,26 @@
///////////////////////////////////////////////////////////////////////
--IR::_TAO_StringDef_Proxy_Broker *
--IR__TAO_StringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+-IR::_TAO_SequenceDef_Proxy_Broker *
+-IR__TAO_SequenceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_SequenceDef_Proxy_Broker *
+_TAO_SequenceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::the_TAO_StringDef_Strategized_Proxy_Broker();
-+ return ::POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::the_TAO_SequenceDef_Strategized_Proxy_Broker();
+ return ::POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::the_TAO_SequenceDef_Strategized_Proxy_Broker();
}
int
--IR__TAO_StringDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+-IR__TAO_SequenceDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_SequenceDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
ACE_UNUSED_ARG (_dummy_);
-- IR__TAO_StringDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_StringDef_Proxy_Broker_Factory_function;
+- IR__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_SequenceDef_Proxy_Broker_Factory_function;
+ _TAO_SequenceDef_Proxy_Broker_Factory_function_pointer =
+ _TAO_SequenceDef_Proxy_Broker_Factory_function;
return 0;
}
--static int IR__TAO_StringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_StringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_StringDef_Proxy_Broker_Factory_Initializer));
+-static int IR__TAO_SequenceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_SequenceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_SequenceDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_SequenceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+ _TAO_SequenceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_SequenceDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
- // ThruPOA Proxy Implementation
- //
-
--POA_IR::_TAO_StringDef_ThruPOA_Proxy_Impl::_TAO_StringDef_ThruPOA_Proxy_Impl (void)
-+POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_TAO_SequenceDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::~_TAO_SequenceDef_ThruPOA_Proxy_Impl (void)
- {}
-
- // ThruPOA Implementation of the IDL interface methods
-
--CORBA::ULong POA_IR::_TAO_StringDef_ThruPOA_Proxy_Impl::bound (
-+CORBA::ULong POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::bound (
- CORBA_Object *_collocated_tao_target_,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -17701,16 +11226,16 @@
- );
- ACE_CHECK_RETURN (_tao_retval);
- return ACE_reinterpret_cast (
-- POA_IR::StringDef_ptr,
-+ POA_IR::SequenceDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/StringDef:1.0"
-+ "IDL:omg.org/IR/SequenceDef:1.0"
- )
- )->bound (
- ACE_TRY_ENV
+@@ -20346,7 +20290,7 @@
);
}
--void POA_IR::_TAO_StringDef_ThruPOA_Proxy_Impl::bound (
-+void POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::bound (
+-IR::IDLType_ptr POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
++IR_IDLType_ptr POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
CORBA_Object *_collocated_tao_target_,
- CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
-@@ -17731,9 +11256,9 @@
- );
- ACE_CHECK;
- ACE_reinterpret_cast (
-- POA_IR::StringDef_ptr,
-+ POA_IR::SequenceDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/StringDef:1.0"
-+ "IDL:omg.org/IR/SequenceDef:1.0"
- )
- )->bound (
- bound,
-@@ -17742,232 +11267,296 @@
- return;
- }
-
-+CORBA::TypeCode_ptr POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+ CORBA::TypeCode_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "element_type",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::SequenceDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/SequenceDef:1.0"
-+ )
-+ )->element_type (
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+IR::IDLType_ptr POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+ IR_IDLType_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "element_type_def",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::SequenceDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/SequenceDef:1.0"
-+ )
-+ )->element_type_def (
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+void POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
-+ CORBA_Object *_collocated_tao_target_,
-+ IR_IDLType_ptr element_type_def,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "element_type_def",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::SequenceDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/SequenceDef:1.0"
-+ )
-+ )->element_type_def (
-+ element_type_def,
-+ ACE_TRY_ENV
-+ );
-+ return;
-+}
-+
- //
- // End ThruPOA Proxy Implementation
- ///////////////////////////////////////////////////////////////////////
-
- // skeleton constructor
--POA_IR::StringDef::StringDef (void)
-+POA_IR::SequenceDef::SequenceDef (void)
+ )
+@@ -20354,7 +20298,7 @@
+ CORBA::SystemException
+ ))
{
-- this->optable_ = &tao_IR_StringDef_optable;
-+ this->optable_ = &tao_IR_SequenceDef_optable;
- }
+- IR::IDLType_var _tao_retval;
++ IR_IDLType_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -20379,7 +20323,7 @@
+ void POA_IR::_TAO_SequenceDef_ThruPOA_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 ((
+@@ -20422,7 +20366,7 @@
// copy ctor
--POA_IR::StringDef::StringDef (const StringDef& rhs)
-+POA_IR::SequenceDef::SequenceDef (const SequenceDef& rhs)
+ POA_IR::SequenceDef::SequenceDef (const SequenceDef& rhs)
: ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+ POA_CORBA_IRObject (rhs),
TAO_ServantBase (rhs)
{}
- // skeleton destructor
--POA_IR::StringDef::~StringDef (void)
-+POA_IR::SequenceDef::~SequenceDef (void)
- {
- }
-
--void POA_IR::StringDef::_get_bound_skel (
-+void POA_IR::SequenceDef::_get_bound_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- POA_IR::StringDef *_tao_impl = (POA_IR::StringDef *)_tao_object_reference;
-+ POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *)_tao_object_reference;
-
- CORBA::ULong _tao_retval = 0;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->bound (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->bound (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::ULong _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+@@ -20520,14 +20464,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+ CORBA::ULong bound;
if (!(
- (_tao_out << _tao_retval)
+ (_tao_in >> bound)
))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
+ ACE_THROW (CORBA::MARSHAL());
--void POA_IR::StringDef::_set_bound_skel (
-+void POA_IR::SequenceDef::_set_bound_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -20678,7 +20620,7 @@
{
- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::StringDef *_tao_impl = (POA_IR::StringDef *)_tao_object_reference;
-+ POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *)_tao_object_reference;
+ POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *)_tao_object_reference;
+
+- IR::IDLType_var _tao_retval;
++ IR_IDLType_var _tao_retval;
--_tao_server_request.argument_flag (0);
-- CORBA::ULong bound;
-+ CORBA::ULong bound;
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -20705,7 +20647,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -20759,14 +20701,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+- IR::IDLType_var element_type_def;
++ IR_IDLType_var element_type_def;
if (!(
- (_tao_in >> bound)
+ (_tao_in >> element_type_def.out ())
))
-- ACE_THROW (CORBA::MARSHAL());
-+ ACE_THROW (CORBA::MARSHAL () );
+ ACE_THROW (CORBA::MARSHAL());
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_impl->bound (
- bound,
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->bound (
-- bound,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- }
-
--void POA_IR::StringDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::SequenceDef::_get_element_type_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *)_tao_object_reference;
-+
-+ CORBA::TypeCode_var _tao_retval;
-+
-+ _tao_retval = _tao_impl->element_type (
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+}
-+
-+void POA_IR::SequenceDef::_get_element_type_def_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *)_tao_object_reference;
-+
-+ IR_IDLType_var _tao_retval;
-+
-+ _tao_retval = _tao_impl->element_type_def (
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+}
-+
-+void POA_IR::SequenceDef::_set_element_type_def_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *)_tao_object_reference;
-+
-+ IR_IDLType_var element_type_def;
-+ if (!(
-+ (_tao_in >> element_type_def.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_impl->element_type_def (
-+ element_type_def.in (),
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+}
-+
-+void POA_IR::SequenceDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::StringDef *_tao_impl = (POA_IR::StringDef *) _tao_object_reference;
-+ POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *) _tao_object_reference;
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -20839,7 +20779,7 @@
+ POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *) _tao_object_reference;
CORBA::Boolean _tao_retval = 0;
CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
ACE_THROW (CORBA::MARSHAL ());
--
-+
+
_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -20847,7 +20787,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -22758,21 +5296,8 @@
ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::StringDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::SequenceDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::StringDef *_tao_impl = (POA_IR::StringDef *) _tao_object_reference;
-+ POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *) _tao_object_reference;
- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -20864,7 +20804,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -22780,31 +5305,7 @@
ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Boolean POA_IR::StringDef::_is_a (
-+CORBA::Boolean POA_IR::SequenceDef::_is_a (
- const 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/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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-@@ -17976,33 +11565,33 @@
- return 0;
- }
-
--void* POA_IR::StringDef::_downcast (
-+void* POA_IR::SequenceDef::_downcast (
- const char* logical_type_id
- )
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/StringDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::StringDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/SequenceDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::SequenceDef_ptr, this);
+@@ -20892,7 +20832,7 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
return ACE_static_cast (POA_IR::IDLType_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
@@ -22813,999 +5314,233 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
- }
-
--void POA_IR::StringDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::SequenceDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--const char* POA_IR::StringDef::_interface_repository_id (void) const
-+const char* POA_IR::SequenceDef::_interface_repository_id (void) const
- {
-- return "IDL:omg.org/IR/StringDef:1.0";
-+ return "IDL:omg.org/IR/SequenceDef:1.0";
- }
-
--IR::StringDef*
--POA_IR::StringDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+IR::SequenceDef*
-+POA_IR::SequenceDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-@@ -18015,253 +11604,103 @@
+@@ -20922,10 +20862,9 @@
ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
CORBA::Object_var obj = tmp;
-- return ::IR::StringDef::_unchecked_narrow (obj.in ());
--}
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::TAO_ServerRequestInfo_IR_StringDef_bound_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::StringDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::result (CORBA::ULong result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_set::TAO_ServerRequestInfo_IR_StringDef_bound_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::StringDef *tao_impl
-- ,
-- const CORBA::ULong & bound,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- bound_ (bound)
--{}
--
--Dynamic::ParameterList *
--POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_bound = parameter_list->length ();
-- parameter_list->length (length_bound + 1);
-- (*parameter_list)[length_bound].argument <<= bound_;
-- (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+- return ::IR::SequenceDef::_unchecked_narrow (obj.in ());
+ return IR_SequenceDef::_unchecked_narrow (obj.in ());
}
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_WstringDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+class TAO_IR_ArrayDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::TAO_ServerRequestInfo_IR_SequenceDef_bound_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -21228,7 +21167,7 @@
+ POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::SequenceDef *tao_impl,
+- IR::IDLType_ptr element_type_def,
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -21300,6 +21239,7 @@
+ }
+
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_ArrayDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
private:
- unsigned int hash (const char *str, unsigned int len);
+@@ -21307,7 +21247,7 @@
public:
const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
};
--/* starting time is 16:31:12 */
+-/* starting time is 18:47:28 */
+/* starting time is 11:23:10 */
/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_WstringDef_Perfect_Hash_OpTable -N lookup */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ArrayDef_Perfect_Hash_OpTable -N lookup */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ArrayDef_Perfect_Hash_OpTable -N lookup */
unsigned int
--TAO_IR_WstringDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+TAO_IR_ArrayDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
- static const unsigned char asso_values[] =
- {
- #if defined (ACE_MVS)
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 0,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 0,
-- 19, 19, 0, 0, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 5, 19, 19, 19, 19, 0, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 0,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 0,
-+ 22, 22, 0, 0, 0, 22, 0, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 5, 22, 22, 22, 22, 0, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22,
- #else
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 0, 19, 0, 19, 19,
-- 0, 0, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 5, 19, 19, 19,
-- 19, 0, 19, 19, 19, 19, 19, 19,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 0, 22, 0, 22, 22,
-+ 0, 0, 0, 22, 0, 22, 22, 22, 22, 22,
-+ 22, 22, 22, 22, 22, 22, 5, 22, 22, 22,
-+ 22, 0, 22, 22, 22, 22, 22, 22,
- #endif /* ACE_MVS */
- };
- return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
- const class TAO_operation_db_entry *
--TAO_IR_WstringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+TAO_IR_ArrayDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
- enum
- {
-- TOTAL_KEYWORDS = 7,
-+ TOTAL_KEYWORDS = 10,
- MIN_WORD_LENGTH = 5,
-- MAX_WORD_LENGTH = 13,
-+ MAX_WORD_LENGTH = 21,
- MIN_HASH_VALUE = 5,
-- MAX_HASH_VALUE = 18,
-- HASH_VALUE_RANGE = 14,
-- DUPLICATES = 2
-+ MAX_HASH_VALUE = 21,
-+ HASH_VALUE_RANGE = 17,
-+ DUPLICATES = 3
- };
-
- static const class TAO_operation_db_entry wordlist[] =
- {
- {"",0},{"",0},{"",0},{"",0},{"",0},
-- {"_is_a", &POA_IR::WstringDef::_is_a_skel},
-- {"destroy", &POA_IR::WstringDef::destroy_skel},
-- {"_get_type", &POA_IR::WstringDef::_get_type_skel},
-- {"_get_bound", &POA_IR::WstringDef::_get_bound_skel},
-- {"_set_bound", &POA_IR::WstringDef::_set_bound_skel},
-- {"_get_def_kind", &POA_IR::WstringDef::_get_def_kind_skel},
-- {"_non_existent", &POA_IR::WstringDef::_non_existent_skel},
-+ {"_is_a", &POA_IR::ArrayDef::_is_a_skel},
-+ {"destroy", &POA_IR::ArrayDef::destroy_skel},
-+ {"_get_type", &POA_IR::ArrayDef::_get_type_skel},
-+ {"_get_length", &POA_IR::ArrayDef::_get_length_skel},
-+ {"_set_length", &POA_IR::ArrayDef::_set_length_skel},
-+ {"_get_def_kind", &POA_IR::ArrayDef::_get_def_kind_skel},
-+ {"_get_element_type", &POA_IR::ArrayDef::_get_element_type_skel},
-+ {"_non_existent", &POA_IR::ArrayDef::_non_existent_skel},
-+ {"_get_element_type_def", &POA_IR::ArrayDef::_get_element_type_def_skel},
-+ {"_set_element_type_def", &POA_IR::ArrayDef::_set_element_type_def_skel},
- };
-
- static const signed char lookup[] =
- {
-- -1, -1, -1, -8, -2, 5, -1, 6, -1, 7, -25, -1, -1, 10,
-- -1, -1, -1, -1, 11,
-+ -1, -1, -1, -8, -2, 5, -1, 6, -1, 7, -1, -29, -1, 10,
-+ -1, -1, -1, 11, 12, -13, -2, -23,
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -18295,38 +11734,37 @@
+@@ -21427,10 +21367,9 @@
}
return 0;
}
--/* ending time is 16:31:12 */
--static TAO_IR_WstringDef_Perfect_Hash_OpTable tao_IR_WstringDef_optable;
--
+-/* ending time is 18:47:28 */
+/* ending time is 11:23:10 */
-+static TAO_IR_ArrayDef_Perfect_Hash_OpTable tao_IR_ArrayDef_optable;
+ static TAO_IR_ArrayDef_Perfect_Hash_OpTable tao_IR_ArrayDef_optable;
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Implementation
//
-
- // Factory function Implementation.
--POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker *POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::the_TAO_WstringDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker *POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::the_TAO_ArrayDef_Strategized_Proxy_Broker (void)
- {
-- static POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ static POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker strategized_proxy_broker;
- return &strategized_proxy_broker;
- }
-
--POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::_TAO_WstringDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::_TAO_ArrayDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- this->proxy_cache_[i] = 0;
+@@ -21456,9 +21395,9 @@
}
--POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::~_TAO_WstringDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::~_TAO_ArrayDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- delete this->proxy_cache_[i];
-
- }
-
--IR::_TAO_WstringDef_Proxy_Impl&
--POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::WstringDef *object,
+-IR::_TAO_ArrayDef_Proxy_Impl&
+_TAO_ArrayDef_Proxy_Impl&
-+POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::select_proxy (
+ POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::ArrayDef *object,
+ IR_ArrayDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -18344,7 +11782,7 @@
- }
-
- void
--POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::create_proxy (
-+POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::create_proxy (
- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -18358,7 +11796,7 @@
+@@ -21490,7 +21429,7 @@
case TAO_ORB_Core::THRU_POA_STRATEGY:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
-- POA_IR::_TAO_WstringDef_ThruPOA_Proxy_Impl,
+- POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl,
+ _TAO_ArrayDef_ThruPOA_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -18368,7 +11806,7 @@
+@@ -21500,7 +21439,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
-- ::IR::_TAO_WstringDef_Remote_Proxy_Impl,
+- ::IR::_TAO_ArrayDef_Remote_Proxy_Impl,
+ _TAO_ArrayDef_Remote_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -18385,38 +11823,41 @@
+@@ -21517,26 +21456,26 @@
///////////////////////////////////////////////////////////////////////
--IR::_TAO_WstringDef_Proxy_Broker *
--IR__TAO_WstringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+-IR::_TAO_ArrayDef_Proxy_Broker *
+-IR__TAO_ArrayDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_ArrayDef_Proxy_Broker *
+_TAO_ArrayDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::the_TAO_WstringDef_Strategized_Proxy_Broker();
-+ return ::POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::the_TAO_ArrayDef_Strategized_Proxy_Broker();
+ return ::POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::the_TAO_ArrayDef_Strategized_Proxy_Broker();
}
int
--IR__TAO_WstringDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+-IR__TAO_ArrayDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_ArrayDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
ACE_UNUSED_ARG (_dummy_);
-- IR__TAO_WstringDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_WstringDef_Proxy_Broker_Factory_function;
+- IR__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_ArrayDef_Proxy_Broker_Factory_function;
+ _TAO_ArrayDef_Proxy_Broker_Factory_function_pointer =
+ _TAO_ArrayDef_Proxy_Broker_Factory_function;
return 0;
}
--static int IR__TAO_WstringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_WstringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_WstringDef_Proxy_Broker_Factory_Initializer));
+-static int IR__TAO_ArrayDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_ArrayDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ArrayDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_ArrayDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+ _TAO_ArrayDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ArrayDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
- // ThruPOA Proxy Implementation
- //
-
--POA_IR::_TAO_WstringDef_ThruPOA_Proxy_Impl::_TAO_WstringDef_ThruPOA_Proxy_Impl (void)
-+POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_TAO_ArrayDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::~_TAO_ArrayDef_ThruPOA_Proxy_Impl (void)
- {}
-
- // ThruPOA Implementation of the IDL interface methods
+@@ -21642,7 +21581,7 @@
+ );
+ }
--CORBA::ULong POA_IR::_TAO_WstringDef_ThruPOA_Proxy_Impl::bound (
-+CORBA::ULong POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::length (
+-IR::IDLType_ptr POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
++IR_IDLType_ptr POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -18432,24 +11873,24 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "bound",
-+ "length",
- forward_to.out (),
- ACE_TRY_ENV
- );
- ACE_CHECK_RETURN (_tao_retval);
- return ACE_reinterpret_cast (
-- POA_IR::WstringDef_ptr,
-+ POA_IR::ArrayDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/WstringDef:1.0"
-+ "IDL:omg.org/IR/ArrayDef:1.0"
- )
-- )->bound (
-+ )->length (
- ACE_TRY_ENV
- );
- }
+@@ -21650,7 +21589,7 @@
+ CORBA::SystemException
+ ))
+ {
+- IR::IDLType_var _tao_retval;
++ IR_IDLType_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -21675,7 +21614,7 @@
--void POA_IR::_TAO_WstringDef_ThruPOA_Proxy_Impl::bound (
-+void POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::length (
+ void POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
CORBA_Object *_collocated_tao_target_,
-- CORBA::ULong bound,
-+ CORBA::ULong length,
+- IR::IDLType_ptr element_type_def,
++ IR_IDLType_ptr element_type_def,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -18462,18 +11903,112 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "bound",
-+ "length",
- forward_to.out (),
- ACE_TRY_ENV
- );
- ACE_CHECK;
- ACE_reinterpret_cast (
-- POA_IR::WstringDef_ptr,
-+ POA_IR::ArrayDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/WstringDef:1.0"
-+ "IDL:omg.org/IR/ArrayDef:1.0"
- )
-- )->bound (
-- bound,
-+ )->length (
-+ length,
-+ ACE_TRY_ENV
-+ );
-+ return;
-+}
-+
-+CORBA::TypeCode_ptr POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+ CORBA::TypeCode_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "element_type",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ArrayDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ArrayDef:1.0"
-+ )
-+ )->element_type (
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+IR::IDLType_ptr POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+ IR_IDLType_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "element_type_def",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ArrayDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ArrayDef:1.0"
-+ )
-+ )->element_type_def (
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+void POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
-+ CORBA_Object *_collocated_tao_target_,
-+ IR_IDLType_ptr element_type_def,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "element_type_def",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::ArrayDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ArrayDef:1.0"
-+ )
-+ )->element_type_def (
-+ element_type_def,
- ACE_TRY_ENV
- );
- return;
-@@ -18484,262 +12019,232 @@
- ///////////////////////////////////////////////////////////////////////
-
- // skeleton constructor
--POA_IR::WstringDef::WstringDef (void)
-+POA_IR::ArrayDef::ArrayDef (void)
- {
-- this->optable_ = &tao_IR_WstringDef_optable;
-+ this->optable_ = &tao_IR_ArrayDef_optable;
- }
-
+@@ -21718,7 +21657,7 @@
// copy ctor
--POA_IR::WstringDef::WstringDef (const WstringDef& rhs)
-+POA_IR::ArrayDef::ArrayDef (const ArrayDef& rhs)
+ POA_IR::ArrayDef::ArrayDef (const ArrayDef& rhs)
: ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+ POA_CORBA_IRObject (rhs),
TAO_ServantBase (rhs)
{}
- // skeleton destructor
--POA_IR::WstringDef::~WstringDef (void)
-+POA_IR::ArrayDef::~ArrayDef (void)
- {
- }
-
--void POA_IR::WstringDef::_get_bound_skel (
-+void POA_IR::ArrayDef::_get_length_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- POA_IR::WstringDef *_tao_impl = (POA_IR::WstringDef *)_tao_object_reference;
-+ POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *)_tao_object_reference;
-
- CORBA::ULong _tao_retval = 0;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->length (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->bound (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::ULong _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+@@ -21816,14 +21755,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+ CORBA::ULong length;
if (!(
- (_tao_out << _tao_retval)
+ (_tao_in >> length)
))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
+ ACE_THROW (CORBA::MARSHAL());
--void POA_IR::WstringDef::_set_bound_skel (
-+void POA_IR::ArrayDef::_set_length_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -21974,7 +21911,7 @@
{
- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::WstringDef *_tao_impl = (POA_IR::WstringDef *)_tao_object_reference;
-+ POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *)_tao_object_reference;
+ POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *)_tao_object_reference;
+
+- IR::IDLType_var _tao_retval;
++ IR_IDLType_var _tao_retval;
--_tao_server_request.argument_flag (0);
-- CORBA::ULong bound;
-+ CORBA::ULong length;
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -22001,7 +21938,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -22055,14 +21992,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+- IR::IDLType_var element_type_def;
++ IR_IDLType_var element_type_def;
if (!(
-- (_tao_in >> bound)
-+ (_tao_in >> length)
+ (_tao_in >> element_type_def.out ())
))
-- ACE_THROW (CORBA::MARSHAL());
-+ ACE_THROW (CORBA::MARSHAL () );
+ ACE_THROW (CORBA::MARSHAL());
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- bound,
-+ _tao_impl->length (
-+ length,
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->bound (
-- bound,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- }
-
--void POA_IR::WstringDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-+void POA_IR::ArrayDef::_get_element_type_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::WstringDef *_tao_impl = (POA_IR::WstringDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = 0;
-- CORBA::String_var value;
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -22135,7 +22070,7 @@
+ POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *) _tao_object_reference;
+ CORBA::Boolean _tao_retval = 0;
+ CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
-- ACE_THROW (CORBA::MARSHAL ());
--
-- _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-+ POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *)_tao_object_reference;
-+
-+ CORBA::TypeCode_var _tao_retval;
-+
-+ _tao_retval = _tao_impl->element_type (
-+ ACE_TRY_ENV
-+ );
-+
- ACE_CHECK;
--
-+
++ if (!((_tao_in >> value.out ())))
+ ACE_THROW (CORBA::MARSHAL ());
+
+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+@@ -22143,7 +22078,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void POA_IR::WstringDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-+void POA_IR::ArrayDef::_get_element_type_def_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- POA_IR::WstringDef *_tao_impl = (POA_IR::WstringDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-+ POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *)_tao_object_reference;
-+
-+ IR_IDLType_var _tao_retval;
-+
-+ _tao_retval = _tao_impl->element_type_def (
-+ ACE_TRY_ENV
-+ );
-+
- ACE_CHECK;
--
-+
++ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
+ ACE_THROW (CORBA::MARSHAL ());
+ }
+
+@@ -22160,7 +22095,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--CORBA::Boolean POA_IR::WstringDef::_is_a (
-- const char* value,
-+void POA_IR::ArrayDef::_set_element_type_def_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
- 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-- return 1;
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *)_tao_object_reference;
-+
-+ IR_IDLType_var element_type_def;
-+ if (!(
-+ (_tao_in >> element_type_def.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_impl->element_type_def (
-+ element_type_def.in (),
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+}
-+
-+void POA_IR::ArrayDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+{
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = 0;
-+ CORBA::String_var value;
-+ if (!((_tao_in >> value.out ())))
-+ ACE_THROW (CORBA::MARSHAL ());
-+
-+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
-+}
-+
-+void POA_IR::ArrayDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+{
-+ POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
-+}
-+
-+CORBA::Boolean POA_IR::ArrayDef::_is_a (
-+ const 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-+ return 1;
- else
- return 0;
+ ACE_THROW (CORBA::MARSHAL ());
}
--void* POA_IR::WstringDef::_downcast (
-+void* POA_IR::ArrayDef::_downcast (
- const char* logical_type_id
- )
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/WstringDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::WstringDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ArrayDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::ArrayDef_ptr, this);
+@@ -22188,7 +22123,7 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
return ACE_static_cast (POA_IR::IDLType_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
@@ -23814,1035 +5549,201 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
- }
-
--void POA_IR::WstringDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::ArrayDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--const char* POA_IR::WstringDef::_interface_repository_id (void) const
-+const char* POA_IR::ArrayDef::_interface_repository_id (void) const
- {
-- return "IDL:omg.org/IR/WstringDef:1.0";
-+ return "IDL:omg.org/IR/ArrayDef:1.0";
- }
-
--IR::WstringDef*
--POA_IR::WstringDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+IR::ArrayDef*
-+POA_IR::ArrayDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-@@ -18752,255 +12257,128 @@
+@@ -22218,10 +22153,9 @@
ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
CORBA::Object_var obj = tmp;
-- return ::IR::WstringDef::_unchecked_narrow (obj.in ());
--}
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::TAO_ServerRequestInfo_IR_WstringDef_bound_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::WstringDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::result (CORBA::ULong result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_set::TAO_ServerRequestInfo_IR_WstringDef_bound_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::WstringDef *tao_impl
-- ,
-- const CORBA::ULong & bound,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- bound_ (bound)
--{}
--
--Dynamic::ParameterList *
--POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_bound = parameter_list->length ();
-- parameter_list->length (length_bound + 1);
-- (*parameter_list)[length_bound].argument <<= bound_;
-- (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+- return ::IR::ArrayDef::_unchecked_narrow (obj.in ());
+ return IR_ArrayDef::_unchecked_narrow (obj.in ());
}
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_FixedDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+class TAO_IR_ExceptionDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::TAO_ServerRequestInfo_IR_ArrayDef_length_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -22524,7 +22458,7 @@
+ POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::ArrayDef *tao_impl,
+- IR::IDLType_ptr element_type_def,
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -22596,6 +22530,7 @@
+ }
+
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_ExceptionDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
private:
- unsigned int hash (const char *str, unsigned int len);
+@@ -22603,7 +22538,7 @@
public:
const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
};
--/* starting time is 16:31:12 */
+-/* starting time is 18:47:28 */
+/* starting time is 11:23:10 */
/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FixedDef_Perfect_Hash_OpTable -N lookup */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ExceptionDef_Perfect_Hash_OpTable -N lookup */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ExceptionDef_Perfect_Hash_OpTable -N lookup */
unsigned int
--TAO_IR_FixedDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+TAO_IR_ExceptionDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
- static const unsigned char asso_values[] =
- {
- #if defined (ACE_MVS)
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 0,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 0,
-- 19, 19, 0, 0, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 0, 5, 19, 19, 19, 19, 0, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 0,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 0,
-+ 52, 20, 3, 0, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 10, 15, 5,
-+ 52, 10, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 15, 15, 52, 52, 52, 15, 5, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52,
- #else
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 0, 19, 0, 19, 19,
-- 0, 0, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 0, 5, 19, 19, 19,
-- 19, 0, 19, 19, 19, 19, 19, 19,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-+ 52, 52, 52, 52, 52, 0, 52, 0, 52, 20,
-+ 3, 0, 52, 52, 52, 52, 52, 52, 10, 15,
-+ 5, 52, 10, 52, 52, 15, 15, 52, 52, 52,
-+ 15, 5, 52, 52, 52, 52, 52, 52,
- #endif /* ACE_MVS */
- };
- return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
- const class TAO_operation_db_entry *
--TAO_IR_FixedDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+TAO_IR_ExceptionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
- enum
- {
-- TOTAL_KEYWORDS = 9,
-- MIN_WORD_LENGTH = 5,
-- MAX_WORD_LENGTH = 13,
-+ TOTAL_KEYWORDS = 33,
-+ MIN_WORD_LENGTH = 4,
-+ MAX_WORD_LENGTH = 26,
- MIN_HASH_VALUE = 5,
-- MAX_HASH_VALUE = 18,
-- HASH_VALUE_RANGE = 14,
-- DUPLICATES = 3
-+ MAX_HASH_VALUE = 51,
-+ HASH_VALUE_RANGE = 47,
-+ DUPLICATES = 7
- };
-
- static const class TAO_operation_db_entry wordlist[] =
- {
- {"",0},{"",0},{"",0},{"",0},{"",0},
-- {"_is_a", &POA_IR::FixedDef::_is_a_skel},
-- {"destroy", &POA_IR::FixedDef::destroy_skel},
-- {"_get_type", &POA_IR::FixedDef::_get_type_skel},
-- {"_get_scale", &POA_IR::FixedDef::_get_scale_skel},
-- {"_set_scale", &POA_IR::FixedDef::_set_scale_skel},
-- {"_get_digits", &POA_IR::FixedDef::_get_digits_skel},
-- {"_set_digits", &POA_IR::FixedDef::_set_digits_skel},
-- {"_get_def_kind", &POA_IR::FixedDef::_get_def_kind_skel},
-- {"_non_existent", &POA_IR::FixedDef::_non_existent_skel},
-+ {"_is_a", &POA_IR::ExceptionDef::_is_a_skel},
-+ {"_get_type", &POA_IR::ExceptionDef::_get_type_skel},
-+ {"_set_name", &POA_IR::ExceptionDef::_set_name_skel},
-+ {"_get_name", &POA_IR::ExceptionDef::_get_name_skel},
-+ {"_get_id", &POA_IR::ExceptionDef::_get_id_skel},
-+ {"_set_id", &POA_IR::ExceptionDef::_set_id_skel},
-+ {"describe", &POA_IR::ExceptionDef::describe_skel},
-+ {"destroy", &POA_IR::ExceptionDef::destroy_skel},
-+ {"_get_def_kind", &POA_IR::ExceptionDef::_get_def_kind_skel},
-+ {"_get_version", &POA_IR::ExceptionDef::_get_version_skel},
-+ {"_set_version", &POA_IR::ExceptionDef::_set_version_skel},
-+ {"_get_absolute_name", &POA_IR::ExceptionDef::_get_absolute_name_skel},
-+ {"move", &POA_IR::ExceptionDef::move_skel},
-+ {"_get_defined_in", &POA_IR::ExceptionDef::_get_defined_in_skel},
-+ {"lookup_name", &POA_IR::ExceptionDef::lookup_name_skel},
-+ {"lookup", &POA_IR::ExceptionDef::lookup_skel},
-+ {"_get_members", &POA_IR::ExceptionDef::_get_members_skel},
-+ {"_set_members", &POA_IR::ExceptionDef::_set_members_skel},
-+ {"_non_existent", &POA_IR::ExceptionDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::ExceptionDef::_get_containing_repository_skel},
-+ {"create_value", &POA_IR::ExceptionDef::create_value_skel},
-+ {"create_module", &POA_IR::ExceptionDef::create_module_skel},
-+ {"create_native", &POA_IR::ExceptionDef::create_native_skel},
-+ {"describe_contents", &POA_IR::ExceptionDef::describe_contents_skel},
-+ {"create_interface", &POA_IR::ExceptionDef::create_interface_skel},
-+ {"create_union", &POA_IR::ExceptionDef::create_union_skel},
-+ {"create_exception", &POA_IR::ExceptionDef::create_exception_skel},
-+ {"contents", &POA_IR::ExceptionDef::contents_skel},
-+ {"create_enum", &POA_IR::ExceptionDef::create_enum_skel},
-+ {"create_alias", &POA_IR::ExceptionDef::create_alias_skel},
-+ {"create_struct", &POA_IR::ExceptionDef::create_struct_skel},
-+ {"create_constant", &POA_IR::ExceptionDef::create_constant_skel},
-+ {"create_value_box", &POA_IR::ExceptionDef::create_value_box_skel},
- };
-
- static const signed char lookup[] =
- {
-- -1, -8, -2, -10, -2, 5, -1, 6, -1, 7, -27, -26, -1, 12,
-- -1, -1, -1, -1, 13,
-+ -1, -1, -1, -6, -3, 5, -1, -9, -2, -57, -54, 11, -1, -14,
-+ -2, 12, 13, -55, 16, 17, 18, 19, -1, -1, -21, -2, 20, -54,
-+ 23, -26, -2, 24, 25, -55, -1, 28, 29, 30, -1, -1, -1, 31,
-+ -1, 32, -1, -1, 33, 34, 35, -1, 36, 37,
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -19034,38 +12412,37 @@
+@@ -22748,10 +22683,9 @@
}
return 0;
}
--/* ending time is 16:31:12 */
--static TAO_IR_FixedDef_Perfect_Hash_OpTable tao_IR_FixedDef_optable;
--
+-/* ending time is 18:47:28 */
+/* ending time is 11:23:10 */
-+static TAO_IR_ExceptionDef_Perfect_Hash_OpTable tao_IR_ExceptionDef_optable;
+ static TAO_IR_ExceptionDef_Perfect_Hash_OpTable tao_IR_ExceptionDef_optable;
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Implementation
//
-
- // Factory function Implementation.
--POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker *POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::the_TAO_FixedDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker *POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::the_TAO_ExceptionDef_Strategized_Proxy_Broker (void)
- {
-- static POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ static POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker strategized_proxy_broker;
- return &strategized_proxy_broker;
- }
-
--POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::_TAO_FixedDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::_TAO_ExceptionDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- this->proxy_cache_[i] = 0;
-
- }
-
--POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::~_TAO_FixedDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::~_TAO_ExceptionDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- delete this->proxy_cache_[i];
+@@ -22777,9 +22711,9 @@
}
--IR::_TAO_FixedDef_Proxy_Impl&
--POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::FixedDef *object,
+-IR::_TAO_ExceptionDef_Proxy_Impl&
+_TAO_ExceptionDef_Proxy_Impl&
-+POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::select_proxy (
+ POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::ExceptionDef *object,
+ IR_ExceptionDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -19083,7 +12460,7 @@
- }
-
- void
--POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::create_proxy (
-+POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::create_proxy (
- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -19097,7 +12474,7 @@
+@@ -22811,7 +22745,7 @@
case TAO_ORB_Core::THRU_POA_STRATEGY:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
-- POA_IR::_TAO_FixedDef_ThruPOA_Proxy_Impl,
+- POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl,
+ _TAO_ExceptionDef_ThruPOA_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -19107,7 +12484,7 @@
+@@ -22821,7 +22755,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
-- ::IR::_TAO_FixedDef_Remote_Proxy_Impl,
+- ::IR::_TAO_ExceptionDef_Remote_Proxy_Impl,
+ _TAO_ExceptionDef_Remote_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -19124,38 +12501,41 @@
+@@ -22838,26 +22772,26 @@
///////////////////////////////////////////////////////////////////////
--IR::_TAO_FixedDef_Proxy_Broker *
--IR__TAO_FixedDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+-IR::_TAO_ExceptionDef_Proxy_Broker *
+-IR__TAO_ExceptionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_ExceptionDef_Proxy_Broker *
+_TAO_ExceptionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::the_TAO_FixedDef_Strategized_Proxy_Broker();
-+ return ::POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::the_TAO_ExceptionDef_Strategized_Proxy_Broker();
+ return ::POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::the_TAO_ExceptionDef_Strategized_Proxy_Broker();
}
int
--IR__TAO_FixedDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+-IR__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
ACE_UNUSED_ARG (_dummy_);
-- IR__TAO_FixedDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_FixedDef_Proxy_Broker_Factory_function;
+- IR__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_ExceptionDef_Proxy_Broker_Factory_function;
+ _TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer =
+ _TAO_ExceptionDef_Proxy_Broker_Factory_function;
return 0;
}
--static int IR__TAO_FixedDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_FixedDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_FixedDef_Proxy_Broker_Factory_Initializer));
+-static int IR__TAO_ExceptionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_ExceptionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+ _TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ExceptionDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
- // ThruPOA Proxy Implementation
- //
-
--POA_IR::_TAO_FixedDef_ThruPOA_Proxy_Impl::_TAO_FixedDef_ThruPOA_Proxy_Impl (void)
-+POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_TAO_ExceptionDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::~_TAO_ExceptionDef_ThruPOA_Proxy_Impl (void)
- {}
-
- // ThruPOA Implementation of the IDL interface methods
-
--CORBA::UShort POA_IR::_TAO_FixedDef_ThruPOA_Proxy_Impl::digits (
-+CORBA::TypeCode_ptr POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::type (
- CORBA_Object *_collocated_tao_target_,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -19163,7 +12543,7 @@
- CORBA::SystemException
- ))
- {
-- CORBA::UShort _tao_retval = 0;
-+ CORBA::TypeCode_var _tao_retval;
- ACE_UNUSED_ARG (_tao_retval);
- TAO_Object_Adapter::Servant_Upcall servant_upcall (
- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -19171,54 +12551,22 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "digits",
-+ "type",
- forward_to.out (),
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (_tao_retval);
-+ ACE_CHECK_RETURN (0);
- return ACE_reinterpret_cast (
-- POA_IR::FixedDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/FixedDef:1.0"
-- )
-- )->digits (
-- ACE_TRY_ENV
-- );
--}
--
--void POA_IR::_TAO_FixedDef_ThruPOA_Proxy_Impl::digits (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::UShort digits,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "digits",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::FixedDef_ptr,
-+ POA_IR::ExceptionDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/FixedDef:1.0"
-+ "IDL:omg.org/IR/ExceptionDef:1.0"
- )
-- )->digits (
-- digits,
-+ )->type (
- ACE_TRY_ENV
+@@ -22900,7 +22834,7 @@
);
-- return;
}
--CORBA::Short POA_IR::_TAO_FixedDef_ThruPOA_Proxy_Impl::scale (
-+IR::StructMemberSeq * POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::members (
+-IR::StructMemberSeq * POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::members (
++IR_StructMemberSeq * POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::members (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -19226,7 +12574,7 @@
+@@ -22908,7 +22842,7 @@
CORBA::SystemException
))
{
-- CORBA::Short _tao_retval = 0;
+- IR::StructMemberSeq_var _tao_retval;
+ IR_StructMemberSeq_var _tao_retval;
ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -19234,24 +12582,24 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "scale",
-+ "members",
- forward_to.out (),
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (_tao_retval);
-+ ACE_CHECK_RETURN (0);
- return ACE_reinterpret_cast (
-- POA_IR::FixedDef_ptr,
-+ POA_IR::ExceptionDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/FixedDef:1.0"
-+ "IDL:omg.org/IR/ExceptionDef:1.0"
- )
-- )->scale (
-+ )->members (
- ACE_TRY_ENV
- );
- }
+@@ -22933,7 +22867,7 @@
--void POA_IR::_TAO_FixedDef_ThruPOA_Proxy_Impl::scale (
-+void POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::members (
+ void POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::members (
CORBA_Object *_collocated_tao_target_,
-- CORBA::Short scale,
+- const IR::StructMemberSeq & members,
+ const IR_StructMemberSeq & members,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -19264,18 +12612,18 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "scale",
-+ "members",
- forward_to.out (),
- ACE_TRY_ENV
- );
- ACE_CHECK;
- ACE_reinterpret_cast (
-- POA_IR::FixedDef_ptr,
-+ POA_IR::ExceptionDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/FixedDef:1.0"
-+ "IDL:omg.org/IR/ExceptionDef:1.0"
- )
-- )->scale (
-- scale,
-+ )->members (
-+ members,
- ACE_TRY_ENV
- );
- return;
-@@ -19286,385 +12634,149 @@
- ///////////////////////////////////////////////////////////////////////
-
- // skeleton constructor
--POA_IR::FixedDef::FixedDef (void)
-+POA_IR::ExceptionDef::ExceptionDef (void)
- {
-- this->optable_ = &tao_IR_FixedDef_optable;
-+ this->optable_ = &tao_IR_ExceptionDef_optable;
- }
-
- // copy ctor
--POA_IR::FixedDef::FixedDef (const FixedDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+@@ -22977,7 +22911,7 @@
+ POA_IR::ExceptionDef::ExceptionDef (const ExceptionDef& rhs)
+ : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ ACE_NESTED_CLASS (POA_IR,Container) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+POA_IR::ExceptionDef::ExceptionDef (const ExceptionDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,Container) (rhs),
+ POA_CORBA_IRObject (rhs),
TAO_ServantBase (rhs)
{}
- // skeleton destructor
--POA_IR::FixedDef::~FixedDef (void)
-+POA_IR::ExceptionDef::~ExceptionDef (void)
- {
- }
-
--void POA_IR::FixedDef::_get_digits_skel (
-+void POA_IR::ExceptionDef::_get_type_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- POA_IR::FixedDef *_tao_impl = (POA_IR::FixedDef *)_tao_object_reference;
-+ POA_IR::ExceptionDef *_tao_impl = (POA_IR::ExceptionDef *)_tao_object_reference;
-
-- CORBA::UShort _tao_retval = 0;
-+ CORBA::TypeCode_var _tao_retval;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->type (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->digits (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::UShort _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
-- (_tao_out << _tao_retval)
-+ (_tao_out << _tao_retval.in ())
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void POA_IR::FixedDef::_set_digits_skel (
-+void POA_IR::ExceptionDef::_get_members_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
+@@ -23075,7 +23009,7 @@
{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::FixedDef *_tao_impl = (POA_IR::FixedDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- CORBA::UShort digits;
-- if (!(
-- (_tao_in >> digits)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+ POA_IR::ExceptionDef *_tao_impl = (POA_IR::ExceptionDef *)_tao_object_reference;
-
+ POA_IR::ExceptionDef *_tao_impl = (POA_IR::ExceptionDef *)_tao_object_reference;
+
+- IR::StructMemberSeq_var _tao_retval;
+ IR_StructMemberSeq_var _tao_retval;
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- digits,
-+ _tao_retval = _tao_impl->members (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->digits (
-- digits,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::FixedDef::_get_scale_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::FixedDef *_tao_impl = (POA_IR::FixedDef *)_tao_object_reference;
--
-- CORBA::Short _tao_retval = 0;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->scale (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::Short _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
-- (_tao_out << _tao_retval)
-+ (_tao_out << _tao_retval.in ())
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void POA_IR::FixedDef::_set_scale_skel (
-+void POA_IR::ExceptionDef::_set_members_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -23102,7 +23036,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::StructMemberSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_StructMemberSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -23156,14 +23090,12 @@
TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::FixedDef *_tao_impl = (POA_IR::FixedDef *)_tao_object_reference;
-+ POA_IR::ExceptionDef *_tao_impl = (POA_IR::ExceptionDef *)_tao_object_reference;
-
--_tao_server_request.argument_flag (0);
-- CORBA::Short scale;
+ POA_IR::ExceptionDef *_tao_impl = (POA_IR::ExceptionDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+- IR::StructMemberSeq members;
+ IR_StructMemberSeq members;
if (!(
-- (_tao_in >> scale)
-+ (_tao_in >> members)
+ (_tao_in >> members)
))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
+ ACE_THROW (CORBA::MARSHAL());
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- scale,
-+ _tao_impl->members (
-+ members,
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-
-- _tao_impl->scale (
-- scale,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- }
-
--void POA_IR::FixedDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::ExceptionDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::FixedDef *_tao_impl = (POA_IR::FixedDef *) _tao_object_reference;
-+ POA_IR::ExceptionDef *_tao_impl = (POA_IR::ExceptionDef *) _tao_object_reference;
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -23236,7 +23168,7 @@
+ POA_IR::ExceptionDef *_tao_impl = (POA_IR::ExceptionDef *) _tao_object_reference;
CORBA::Boolean _tao_retval = 0;
CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
ACE_THROW (CORBA::MARSHAL ());
--
-+
+
_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -23244,7 +23176,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -24850,21 +5751,8 @@
ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::FixedDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::ExceptionDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::FixedDef *_tao_impl = (POA_IR::FixedDef *) _tao_object_reference;
-+ POA_IR::ExceptionDef *_tao_impl = (POA_IR::ExceptionDef *) _tao_object_reference;
- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -23261,7 +23193,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -24872,63 +5760,22 @@
ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Boolean POA_IR::FixedDef::_is_a (
-+CORBA::Boolean POA_IR::ExceptionDef::_is_a (
- const 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/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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
- return 1;
-@@ -19672,445 +12784,138 @@
- return 0;
- }
-
--void* POA_IR::FixedDef::_downcast (
-+void* POA_IR::ExceptionDef::_downcast (
- const char* logical_type_id
- )
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/FixedDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::FixedDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-- return ACE_static_cast (POA_IR::IDLType_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ExceptionDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::ExceptionDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Contained_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Container_ptr, this);
+@@ -23292,7 +23224,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
+ return ACE_static_cast (POA_IR::Container_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
+@@ -23308,24 +23240,6 @@
+ return "IDL:omg.org/IR/ExceptionDef:1.0";
}
--void POA_IR::FixedDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::ExceptionDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--const char* POA_IR::FixedDef::_interface_repository_id (void) const
+-IR::ExceptionDef*
+-POA_IR::ExceptionDef::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-- return "IDL:omg.org/IR/FixedDef:1.0";
--}
--
--IR::FixedDef*
--POA_IR::FixedDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+const char* POA_IR::ExceptionDef::_interface_repository_id (void) const
- {
- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
@@ -24940,1308 +5787,257 @@
- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-
- CORBA::Object_var obj = tmp;
-- return ::IR::FixedDef::_unchecked_narrow (obj.in ());
-+ return "IDL:omg.org/IR/ExceptionDef:1.0";
- }
-
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::TAO_ServerRequestInfo_IR_FixedDef_digits_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::FixedDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::result (CORBA::UShort result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_set::TAO_ServerRequestInfo_IR_FixedDef_digits_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::FixedDef *tao_impl
-- ,
-- const CORBA::UShort & digits,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- digits_ (digits)
--{}
--
--Dynamic::ParameterList *
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_digits = parameter_list->length ();
-- parameter_list->length (length_digits + 1);
-- (*parameter_list)[length_digits].argument <<= digits_;
-- (*parameter_list)[length_digits].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get::TAO_ServerRequestInfo_IR_FixedDef_scale_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::FixedDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get::result (CORBA::Short result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_set::TAO_ServerRequestInfo_IR_FixedDef_scale_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::FixedDef *tao_impl
-- ,
-- const CORBA::Short & scale,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- scale_ (scale)
--{}
--
--Dynamic::ParameterList *
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_scale = parameter_list->length ();
-- parameter_list->length (length_scale + 1);
-- (*parameter_list)[length_scale].argument <<= scale_;
-- (*parameter_list)[length_scale].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+- return ::IR::ExceptionDef::_unchecked_narrow (obj.in ());
-}
-
--CORBA::Boolean
--POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_SequenceDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+class TAO_IR_AttributeDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::TAO_ServerRequestInfo_IR_ExceptionDef_type_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -23480,7 +23394,7 @@
+ POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_set::TAO_ServerRequestInfo_IR_ExceptionDef_members_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::ExceptionDef *tao_impl,
+- const IR::StructMemberSeq & members,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -23552,6 +23466,7 @@
+ }
+
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_AttributeDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
private:
- unsigned int hash (const char *str, unsigned int len);
+@@ -23559,7 +23474,7 @@
public:
const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
};
--/* starting time is 16:31:12 */
+-/* starting time is 18:47:28 */
+/* starting time is 11:23:10 */
/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_SequenceDef_Perfect_Hash_OpTable -N lookup */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_AttributeDef_Perfect_Hash_OpTable -N lookup */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_AttributeDef_Perfect_Hash_OpTable -N lookup */
unsigned int
--TAO_IR_SequenceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+TAO_IR_AttributeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
- static const unsigned char asso_values[] =
- {
- #if defined (ACE_MVS)
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 0,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 0,
-- 22, 22, 0, 0, 0, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 5, 22, 22, 22, 22, 0, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 0, 0, 10, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 15, 37, 37, 37, 37, 10, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37,
- #else
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 0, 22, 0, 22, 22,
-- 0, 0, 0, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 5, 22, 22, 22,
-- 22, 0, 22, 22, 22, 22, 22, 22,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-+ 0, 0, 10, 37, 37, 37, 37, 37, 37, 0,
-+ 0, 37, 37, 37, 37, 37, 15, 37, 37, 37,
-+ 37, 10, 37, 37, 37, 37, 37, 37,
- #endif /* ACE_MVS */
- };
- return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
- const class TAO_operation_db_entry *
--TAO_IR_SequenceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+TAO_IR_AttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
- enum
- {
-- TOTAL_KEYWORDS = 10,
-- MIN_WORD_LENGTH = 5,
-- MAX_WORD_LENGTH = 21,
-- MIN_HASH_VALUE = 5,
-- MAX_HASH_VALUE = 21,
-- HASH_VALUE_RANGE = 17,
-- DUPLICATES = 3
-+ TOTAL_KEYWORDS = 20,
-+ MIN_WORD_LENGTH = 4,
-+ MAX_WORD_LENGTH = 26,
-+ MIN_HASH_VALUE = 4,
-+ MAX_HASH_VALUE = 36,
-+ HASH_VALUE_RANGE = 33,
-+ DUPLICATES = 8
- };
-
- static const class TAO_operation_db_entry wordlist[] =
- {
-- {"",0},{"",0},{"",0},{"",0},{"",0},
-- {"_is_a", &POA_IR::SequenceDef::_is_a_skel},
-- {"destroy", &POA_IR::SequenceDef::destroy_skel},
-- {"_get_type", &POA_IR::SequenceDef::_get_type_skel},
-- {"_get_bound", &POA_IR::SequenceDef::_get_bound_skel},
-- {"_set_bound", &POA_IR::SequenceDef::_set_bound_skel},
-- {"_get_def_kind", &POA_IR::SequenceDef::_get_def_kind_skel},
-- {"_get_element_type", &POA_IR::SequenceDef::_get_element_type_skel},
-- {"_non_existent", &POA_IR::SequenceDef::_non_existent_skel},
-- {"_get_element_type_def", &POA_IR::SequenceDef::_get_element_type_def_skel},
-- {"_set_element_type_def", &POA_IR::SequenceDef::_set_element_type_def_skel},
-+ {"",0},{"",0},{"",0},{"",0},
-+ {"move", &POA_IR::AttributeDef::move_skel},
-+ {"_is_a", &POA_IR::AttributeDef::_is_a_skel},
-+ {"_get_id", &POA_IR::AttributeDef::_get_id_skel},
-+ {"_set_id", &POA_IR::AttributeDef::_set_id_skel},
-+ {"describe", &POA_IR::AttributeDef::describe_skel},
-+ {"_get_type", &POA_IR::AttributeDef::_get_type_skel},
-+ {"_set_name", &POA_IR::AttributeDef::_set_name_skel},
-+ {"_get_name", &POA_IR::AttributeDef::_get_name_skel},
-+ {"_set_mode", &POA_IR::AttributeDef::_set_mode_skel},
-+ {"_get_mode", &POA_IR::AttributeDef::_get_mode_skel},
-+ {"_get_version", &POA_IR::AttributeDef::_get_version_skel},
-+ {"_set_version", &POA_IR::AttributeDef::_set_version_skel},
-+ {"_get_def_kind", &POA_IR::AttributeDef::_get_def_kind_skel},
-+ {"_get_defined_in", &POA_IR::AttributeDef::_get_defined_in_skel},
-+ {"destroy", &POA_IR::AttributeDef::destroy_skel},
-+ {"_get_absolute_name", &POA_IR::AttributeDef::_get_absolute_name_skel},
-+ {"_get_type_def", &POA_IR::AttributeDef::_get_type_def_skel},
-+ {"_set_type_def", &POA_IR::AttributeDef::_set_type_def_skel},
-+ {"_non_existent", &POA_IR::AttributeDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::AttributeDef::_get_containing_repository_skel},
- };
-
- static const signed char lookup[] =
- {
-- -1, -1, -1, -8, -2, 5, -1, 6, -1, 7, -28, -1, -1, 10,
-- -1, -1, -1, 11, 12, -13, -2, -23,
-+ -6, -2, -9, -5, 4, 5, -1, -43, 8, -43, -14, -2, -38, 16,
-+ -1, 17, -1, 18, 19, -1, -1, -20, -2, -38, -1, -1, -1, -1,
-+ 22, -1, -1, -1, -1, -1, -1, -1, 23,
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -20144,38 +12949,37 @@
+@@ -23690,10 +23605,9 @@
}
return 0;
}
--/* ending time is 16:31:12 */
--static TAO_IR_SequenceDef_Perfect_Hash_OpTable tao_IR_SequenceDef_optable;
--
+-/* ending time is 18:47:28 */
+/* ending time is 11:23:10 */
-+static TAO_IR_AttributeDef_Perfect_Hash_OpTable tao_IR_AttributeDef_optable;
+ static TAO_IR_AttributeDef_Perfect_Hash_OpTable tao_IR_AttributeDef_optable;
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Implementation
//
-
- // Factory function Implementation.
--POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker *POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::the_TAO_SequenceDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker *POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::the_TAO_AttributeDef_Strategized_Proxy_Broker (void)
- {
-- static POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ static POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker strategized_proxy_broker;
- return &strategized_proxy_broker;
- }
-
--POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::_TAO_SequenceDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::_TAO_AttributeDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- this->proxy_cache_[i] = 0;
+@@ -23719,9 +23633,9 @@
}
--POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::~_TAO_SequenceDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::~_TAO_AttributeDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- delete this->proxy_cache_[i];
-
- }
-
--IR::_TAO_SequenceDef_Proxy_Impl&
--POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::SequenceDef *object,
+-IR::_TAO_AttributeDef_Proxy_Impl&
+_TAO_AttributeDef_Proxy_Impl&
-+POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::select_proxy (
+ POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::AttributeDef *object,
+ IR_AttributeDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -20193,7 +12997,7 @@
- }
-
- void
--POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::create_proxy (
-+POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::create_proxy (
- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -20207,7 +13011,7 @@
+@@ -23753,7 +23667,7 @@
case TAO_ORB_Core::THRU_POA_STRATEGY:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
-- POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl,
+- POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl,
+ _TAO_AttributeDef_ThruPOA_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -20217,7 +13021,7 @@
+@@ -23763,7 +23677,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
-- ::IR::_TAO_SequenceDef_Remote_Proxy_Impl,
+- ::IR::_TAO_AttributeDef_Remote_Proxy_Impl,
+ _TAO_AttributeDef_Remote_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -20234,38 +13038,41 @@
+@@ -23780,26 +23694,26 @@
///////////////////////////////////////////////////////////////////////
--IR::_TAO_SequenceDef_Proxy_Broker *
--IR__TAO_SequenceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+-IR::_TAO_AttributeDef_Proxy_Broker *
+-IR__TAO_AttributeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_AttributeDef_Proxy_Broker *
+_TAO_AttributeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::the_TAO_SequenceDef_Strategized_Proxy_Broker();
-+ return ::POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::the_TAO_AttributeDef_Strategized_Proxy_Broker();
+ return ::POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::the_TAO_AttributeDef_Strategized_Proxy_Broker();
}
int
--IR__TAO_SequenceDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+-IR__TAO_AttributeDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_AttributeDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
ACE_UNUSED_ARG (_dummy_);
-- IR__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_SequenceDef_Proxy_Broker_Factory_function;
+- IR__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_AttributeDef_Proxy_Broker_Factory_function;
+ _TAO_AttributeDef_Proxy_Broker_Factory_function_pointer =
+ _TAO_AttributeDef_Proxy_Broker_Factory_function;
return 0;
}
--static int IR__TAO_SequenceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_SequenceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_SequenceDef_Proxy_Broker_Factory_Initializer));
+-static int IR__TAO_AttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_AttributeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_AttributeDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_AttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+ _TAO_AttributeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_AttributeDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
- // ThruPOA Proxy Implementation
- //
-
--POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_TAO_SequenceDef_ThruPOA_Proxy_Impl (void)
-+POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_TAO_AttributeDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::~_TAO_AttributeDef_ThruPOA_Proxy_Impl (void)
- {}
-
- // ThruPOA Implementation of the IDL interface methods
-
--CORBA::ULong POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::bound (
-+CORBA::TypeCode_ptr POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type (
- CORBA_Object *_collocated_tao_target_,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -20273,7 +13080,7 @@
- CORBA::SystemException
- ))
- {
-- CORBA::ULong _tao_retval = 0;
-+ CORBA::TypeCode_var _tao_retval;
- ACE_UNUSED_ARG (_tao_retval);
- TAO_Object_Adapter::Servant_Upcall servant_upcall (
- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -20281,85 +13088,85 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "bound",
-+ "type",
- forward_to.out (),
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (_tao_retval);
-+ ACE_CHECK_RETURN (0);
- return ACE_reinterpret_cast (
-- POA_IR::SequenceDef_ptr,
-+ POA_IR::AttributeDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/SequenceDef:1.0"
-+ "IDL:omg.org/IR/AttributeDef:1.0"
- )
-- )->bound (
-+ )->type (
- ACE_TRY_ENV
+@@ -23842,7 +23756,7 @@
);
}
--void POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::bound (
-+IR::IDLType_ptr POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type_def (
+-IR::IDLType_ptr POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type_def (
++IR_IDLType_ptr POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type_def (
CORBA_Object *_collocated_tao_target_,
-- CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
+@@ -23850,7 +23764,7 @@
CORBA::SystemException
))
{
+- IR::IDLType_var _tao_retval;
+ IR_IDLType_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
+ ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "bound",
-+ "type_def",
- forward_to.out (),
- ACE_TRY_ENV
- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::SequenceDef_ptr,
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::AttributeDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/SequenceDef:1.0"
-+ "IDL:omg.org/IR/AttributeDef:1.0"
- )
-- )->bound (
-- bound,
-+ )->type_def (
- ACE_TRY_ENV
- );
-- return;
- }
+@@ -23875,7 +23789,7 @@
--CORBA::TypeCode_ptr POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type (
-+void POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type_def (
+ void POA_IR::_TAO_AttributeDef_ThruPOA_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
- ))
- {
-- CORBA::TypeCode_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
- TAO_Object_Adapter::Servant_Upcall servant_upcall (
- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "element_type",
-+ "type_def",
- forward_to.out (),
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::SequenceDef_ptr,
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::AttributeDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/SequenceDef:1.0"
-+ "IDL:omg.org/IR/AttributeDef:1.0"
- )
-- )->element_type (
-+ )->type_def (
-+ type_def,
- ACE_TRY_ENV
- );
-+ return;
+@@ -23905,7 +23819,7 @@
+ return;
}
--IR::IDLType_ptr POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
-+IR::AttributeMode POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::mode (
+-IR::AttributeMode POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::mode (
++IR_AttributeMode POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::mode (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -20367,7 +13174,7 @@
+@@ -23913,7 +23827,7 @@
CORBA::SystemException
))
{
-- IR::IDLType_var _tao_retval;
+- IR::AttributeMode _tao_retval;
+ IR_AttributeMode _tao_retval;
ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -20375,24 +13182,24 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "element_type_def",
-+ "mode",
- forward_to.out (),
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (0);
-+ ACE_CHECK_RETURN (_tao_retval);
- return ACE_reinterpret_cast (
-- POA_IR::SequenceDef_ptr,
-+ POA_IR::AttributeDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/SequenceDef:1.0"
-+ "IDL:omg.org/IR/AttributeDef:1.0"
- )
-- )->element_type_def (
-+ )->mode (
- ACE_TRY_ENV
- );
- }
+@@ -23938,7 +23852,7 @@
--void POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
-+void POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::mode (
+ void POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::mode (
CORBA_Object *_collocated_tao_target_,
-- IR::IDLType_ptr element_type_def,
+- IR::AttributeMode mode,
+ IR_AttributeMode mode,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -20405,18 +13212,18 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "element_type_def",
-+ "mode",
- forward_to.out (),
- ACE_TRY_ENV
- );
- ACE_CHECK;
- ACE_reinterpret_cast (
-- POA_IR::SequenceDef_ptr,
-+ POA_IR::AttributeDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/SequenceDef:1.0"
-+ "IDL:omg.org/IR/AttributeDef:1.0"
- )
-- )->element_type_def (
-- element_type_def,
-+ )->mode (
-+ mode,
- ACE_TRY_ENV
- );
- return;
-@@ -20427,465 +13234,199 @@
- ///////////////////////////////////////////////////////////////////////
-
- // skeleton constructor
--POA_IR::SequenceDef::SequenceDef (void)
-+POA_IR::AttributeDef::AttributeDef (void)
- {
-- this->optable_ = &tao_IR_SequenceDef_optable;
-+ this->optable_ = &tao_IR_AttributeDef_optable;
- }
-
+@@ -23981,7 +23895,7 @@
// copy ctor
--POA_IR::SequenceDef::SequenceDef (const SequenceDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+ POA_IR::AttributeDef::AttributeDef (const AttributeDef& rhs)
+ : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+POA_IR::AttributeDef::AttributeDef (const AttributeDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ POA_CORBA_IRObject (rhs),
TAO_ServantBase (rhs)
{}
- // skeleton destructor
--POA_IR::SequenceDef::~SequenceDef (void)
-+POA_IR::AttributeDef::~AttributeDef (void)
- {
- }
-
--void POA_IR::SequenceDef::_get_bound_skel (
-+void POA_IR::AttributeDef::_get_type_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
+@@ -24079,7 +23993,7 @@
{
-- POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *)_tao_object_reference;
-+ POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *)_tao_object_reference;
-
-- CORBA::ULong _tao_retval = 0;
-+ CORBA::TypeCode_var _tao_retval;
+ POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *)_tao_object_reference;
+
+- IR::IDLType_var _tao_retval;
++ IR_IDLType_var _tao_retval;
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->type (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->bound (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::ULong _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -24106,7 +24020,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -24160,14 +24074,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+- IR::IDLType_var type_def;
++ IR_IDLType_var type_def;
if (!(
-- (_tao_out << _tao_retval)
-+ (_tao_out << _tao_retval.in ())
+ (_tao_in >> type_def.out ())
))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
+ ACE_THROW (CORBA::MARSHAL());
--void POA_IR::SequenceDef::_set_bound_skel (
-+void POA_IR::AttributeDef::_get_type_def_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *)_tao_object_reference;
-
--_tao_server_request.argument_flag (0);
-- CORBA::ULong bound;
-- if (!(
-- (_tao_in >> bound)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+ POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *)_tao_object_reference;
-
-+ IR_IDLType_var _tao_retval;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- bound,
-+ _tao_retval = _tao_impl->type_def (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->bound (
-- bound,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void POA_IR::SequenceDef::_get_element_type_skel (
-+void POA_IR::AttributeDef::_set_type_def_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -24238,7 +24150,7 @@
{
-- POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *)_tao_object_reference;
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *)_tao_object_reference;
-
-- CORBA::TypeCode_var _tao_retval;
-+ IR_IDLType_var type_def;
-+ if (!(
-+ (_tao_in >> type_def.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_impl->type_def (
-+ type_def.in (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->element_type (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-
-+ _tao_server_request.init_reply ();
- }
-
--void POA_IR::SequenceDef::_get_element_type_def_skel (
-+void POA_IR::AttributeDef::_get_mode_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *)_tao_object_reference;
-+ POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *)_tao_object_reference;
-
-- IR::IDLType_var _tao_retval;
+ POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *)_tao_object_reference;
+
+- IR::AttributeMode _tao_retval;
+ IR_AttributeMode _tao_retval;
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->mode (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->element_type_def (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
-- (_tao_out << _tao_retval.in ())
-+ (_tao_out << _tao_retval)
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void POA_IR::SequenceDef::_set_element_type_def_skel (
-+void POA_IR::AttributeDef::_set_mode_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -24265,7 +24177,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::AttributeMode _tao_retval_info = _tao_retval;
++ IR_AttributeMode _tao_retval_info = _tao_retval;
+ ri.result (_tao_retval_info);
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+ _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+@@ -24318,14 +24230,12 @@
TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *)_tao_object_reference;
-+ POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *)_tao_object_reference;
-
--_tao_server_request.argument_flag (0);
-- IR::IDLType_var element_type_def;
+ POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+- IR::AttributeMode mode;
+ IR_AttributeMode mode;
if (!(
-- (_tao_in >> element_type_def.out ())
-+ (_tao_in >> mode)
+ (_tao_in >> mode)
))
-- ACE_THROW (CORBA::MARSHAL());
-+ ACE_THROW (CORBA::MARSHAL () );
-
+ ACE_THROW (CORBA::MARSHAL());
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- element_type_def.in (),
-+ _tao_impl->mode (
-+ mode,
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-
-- _tao_impl->element_type_def (
-- element_type_def.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- }
-
--void POA_IR::SequenceDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::AttributeDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *) _tao_object_reference;
-+ POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *) _tao_object_reference;
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -24398,7 +24308,7 @@
+ POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *) _tao_object_reference;
CORBA::Boolean _tao_retval = 0;
CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
ACE_THROW (CORBA::MARSHAL ());
--
-+
+
_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -24406,7 +24316,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -26249,21 +6045,8 @@
ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::SequenceDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::AttributeDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *) _tao_object_reference;
-+ POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *) _tao_object_reference;
- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -24423,7 +24333,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -26271,3412 +6054,709 @@
ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Boolean POA_IR::SequenceDef::_is_a (
-+CORBA::Boolean POA_IR::AttributeDef::_is_a (
- const 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/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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
- return 1;
-@@ -20893,33 +13434,33 @@
- return 0;
- }
-
--void* POA_IR::SequenceDef::_downcast (
-+void* POA_IR::AttributeDef::_downcast (
- const char* logical_type_id
- )
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/SequenceDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::SequenceDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-- return ACE_static_cast (POA_IR::IDLType_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/AttributeDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::AttributeDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Contained_ptr, this);
+@@ -24451,7 +24361,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
+ return ACE_static_cast (POA_IR::Contained_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
- }
-
--void POA_IR::SequenceDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::AttributeDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--const char* POA_IR::SequenceDef::_interface_repository_id (void) const
-+const char* POA_IR::AttributeDef::_interface_repository_id (void) const
- {
-- return "IDL:omg.org/IR/SequenceDef:1.0";
-+ return "IDL:omg.org/IR/AttributeDef:1.0";
- }
-
--IR::SequenceDef*
--POA_IR::SequenceDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+IR::AttributeDef*
-+POA_IR::AttributeDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-@@ -20932,765 +13473,642 @@
+@@ -24481,10 +24391,9 @@
ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
CORBA::Object_var obj = tmp;
-- return ::IR::SequenceDef::_unchecked_narrow (obj.in ());
+- return ::IR::AttributeDef::_unchecked_narrow (obj.in ());
+ return IR_AttributeDef::_unchecked_narrow (obj.in ());
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::TAO_ServerRequestInfo_IR_SequenceDef_bound_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::SequenceDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+class TAO_IR_OperationDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+private:
-+ unsigned int hash (const char *str, unsigned int len);
-+public:
-+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-+};
-+/* starting time is 11:23:10 */
-+/* C++ code produced by gperf version 2.8 (ACE version) */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_OperationDef_Perfect_Hash_OpTable -N lookup */
-+unsigned int
-+TAO_IR_OperationDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ static const unsigned char asso_values[] =
-+ {
-+#if defined (ACE_MVS)
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 15, 0, 10, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 0, 5,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 0, 20, 37, 37, 37, 37, 10, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37,
-+#else
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-+ 15, 0, 10, 37, 37, 37, 37, 37, 37, 0,
-+ 5, 37, 37, 37, 37, 0, 20, 37, 37, 37,
-+ 37, 10, 37, 37, 37, 37, 37, 37,
-+#endif /* ACE_MVS */
-+ };
-+ return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
--CORBA::Any *
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+const class TAO_operation_db_entry *
-+TAO_IR_OperationDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+ enum
-+ {
-+ TOTAL_KEYWORDS = 26,
-+ MIN_WORD_LENGTH = 4,
-+ MAX_WORD_LENGTH = 26,
-+ MIN_HASH_VALUE = 4,
-+ MAX_HASH_VALUE = 36,
-+ HASH_VALUE_RANGE = 33,
-+ DUPLICATES = 10
-+ };
-
--char *
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ static const class TAO_operation_db_entry wordlist[] =
-+ {
-+ {"",0},{"",0},{"",0},{"",0},
-+ {"move", &POA_IR::OperationDef::move_skel},
-+ {"_is_a", &POA_IR::OperationDef::_is_a_skel},
-+ {"_get_mode", &POA_IR::OperationDef::_get_mode_skel},
-+ {"_set_name", &POA_IR::OperationDef::_set_name_skel},
-+ {"_get_name", &POA_IR::OperationDef::_get_name_skel},
-+ {"_set_mode", &POA_IR::OperationDef::_set_mode_skel},
-+ {"_get_params", &POA_IR::OperationDef::_get_params_skel},
-+ {"_set_params", &POA_IR::OperationDef::_set_params_skel},
-+ {"_get_contexts", &POA_IR::OperationDef::_get_contexts_skel},
-+ {"_set_contexts", &POA_IR::OperationDef::_set_contexts_skel},
-+ {"_get_exceptions", &POA_IR::OperationDef::_get_exceptions_skel},
-+ {"_set_exceptions", &POA_IR::OperationDef::_set_exceptions_skel},
-+ {"_get_version", &POA_IR::OperationDef::_get_version_skel},
-+ {"_set_version", &POA_IR::OperationDef::_set_version_skel},
-+ {"_get_absolute_name", &POA_IR::OperationDef::_get_absolute_name_skel},
-+ {"_get_defined_in", &POA_IR::OperationDef::_get_defined_in_skel},
-+ {"_get_id", &POA_IR::OperationDef::_get_id_skel},
-+ {"_set_id", &POA_IR::OperationDef::_set_id_skel},
-+ {"describe", &POA_IR::OperationDef::describe_skel},
-+ {"_get_result_def", &POA_IR::OperationDef::_get_result_def_skel},
-+ {"_set_result_def", &POA_IR::OperationDef::_set_result_def_skel},
-+ {"_get_def_kind", &POA_IR::OperationDef::_get_def_kind_skel},
-+ {"_get_result", &POA_IR::OperationDef::_get_result_skel},
-+ {"destroy", &POA_IR::OperationDef::destroy_skel},
-+ {"_non_existent", &POA_IR::OperationDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::OperationDef::_get_containing_repository_skel},
-+ };
-
--CORBA::Boolean
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-+ {
-+ unsigned int key = hash (str, len);
-
--void
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::result (CORBA::ULong result)
--{
-- // Update the result.
-- this->_result = result;
-+ if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-+ {
-+ {
-+ const class TAO_operation_db_entry *resword;
-+
-+ switch (key)
-+ {
-+ case 4:
-+ resword = &wordlist[4]; break;
-+ case 5:
-+ resword = &wordlist[5]; break;
-+ case 9:
-+ resword = &wordlist[6];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[7];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[8];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[9];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ return 0;
-+ case 11:
-+ resword = &wordlist[10];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[11];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ return 0;
-+ case 13:
-+ resword = &wordlist[12];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[13];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ return 0;
-+ case 15:
-+ resword = &wordlist[14];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[15];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ return 0;
-+ case 17:
-+ resword = &wordlist[16];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[17];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ return 0;
-+ case 18:
-+ resword = &wordlist[18]; break;
-+ case 20:
-+ resword = &wordlist[19]; break;
-+ case 22:
-+ resword = &wordlist[20];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[21];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ return 0;
-+ case 23:
-+ resword = &wordlist[22]; break;
-+ case 25:
-+ resword = &wordlist[23];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[24];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ return 0;
-+ case 28:
-+ resword = &wordlist[25]; break;
-+ case 31:
-+ resword = &wordlist[26]; break;
-+ case 32:
-+ resword = &wordlist[27]; break;
-+ case 33:
-+ resword = &wordlist[28]; break;
-+ case 36:
-+ resword = &wordlist[29]; break;
-+ default: return 0;
-+ }
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1))
-+ return resword;
-+ return 0;
-+ }
-+ }
-+ }
-+ return 0;
- }
-+/* ending time is 11:23:10 */
-+static TAO_IR_OperationDef_Perfect_Hash_OpTable tao_IR_OperationDef_optable;
-
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_set::TAO_ServerRequestInfo_IR_SequenceDef_bound_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::SequenceDef *tao_impl
-- ,
-- const CORBA::ULong & bound,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- bound_ (bound)
--{}
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Implementation
-+//
-
--Dynamic::ParameterList *
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+// Factory function Implementation.
-+POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker *POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::the_TAO_OperationDef_Strategized_Proxy_Broker (void)
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_bound = parameter_list->length ();
-- parameter_list->length (length_bound + 1);
-- (*parameter_list)[length_bound].argument <<= bound_;
-- (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ static POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ return &strategized_proxy_broker;
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::TAO_ServerRequestInfo_IR_AttributeDef_type_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -24639,7 +24548,7 @@
+ POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::AttributeDef *tao_impl,
+- IR::IDLType_ptr type_def,
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -24788,7 +24697,7 @@
+ POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_set::TAO_ServerRequestInfo_IR_AttributeDef_mode_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::AttributeDef *tao_impl,
+- IR::AttributeMode & mode,
++ IR_AttributeMode & mode,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -24860,6 +24769,7 @@
}
--Dynamic::ExceptionList *
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::_TAO_OperationDef_Strategized_Proxy_Broker (void)
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_OperationDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ this->proxy_cache_[i] = 0;
-
-- return exception_list;
+ private:
+@@ -24867,7 +24777,7 @@
+ public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 18:47:28 */
++/* starting time is 11:23:10 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_OperationDef_Perfect_Hash_OpTable -N lookup */
+ unsigned int
+@@ -25053,10 +24963,9 @@
+ }
+ return 0;
}
+-/* ending time is 18:47:28 */
++/* ending time is 11:23:10 */
+ static TAO_IR_OperationDef_Perfect_Hash_OpTable tao_IR_OperationDef_optable;
--CORBA::Any *
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::~_TAO_OperationDef_Strategized_Proxy_Broker (void)
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ delete this->proxy_cache_[i];
-
-- return result_any;
--}
-
--char *
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Implementation
+ //
+@@ -25082,9 +24991,9 @@
+
}
--CORBA::Boolean
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
+-IR::_TAO_OperationDef_Proxy_Impl&
+_TAO_OperationDef_Proxy_Impl&
-+POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::select_proxy (
+ POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::OperationDef *object,
+ IR_OperationDef *object,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-+ TAO_ORB_Core::collocation_strategy (object);
-+
-+ if (this->proxy_cache_[strategy] != 0)
-+ return *this->proxy_cache_[strategy];
-+
-+ this->create_proxy (strategy, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-+
-+ return *this->proxy_cache_[strategy];
-+
- }
-
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::SequenceDef *tao_impl
-- ,
-- CORBA::Environment &
-+void
-+POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::create_proxy (
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA::Environment &ACE_TRY_ENV
)
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
-- return parameter_list;
-+ if (this->proxy_cache_[strategy] == 0)
-+ {
-+ switch (strategy)
-+ {
-+ case TAO_ORB_Core::THRU_POA_STRATEGY:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+@@ -25116,7 +25025,7 @@
+ case TAO_ORB_Core::THRU_POA_STRATEGY:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl,
+ _TAO_OperationDef_ThruPOA_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ case TAO_ORB_Core::REMOTE_STRATEGY:
-+ default:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -25126,7 +25035,7 @@
+ default:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- ::IR::_TAO_OperationDef_Remote_Proxy_Impl,
+ _TAO_OperationDef_Remote_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ }
-+
-+ }
- }
-
--Dynamic::ExceptionList *
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+
-+//
-+// End Strategized Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-+
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -25143,26 +25052,26 @@
+ ///////////////////////////////////////////////////////////////////////
+
+
+-IR::_TAO_OperationDef_Proxy_Broker *
+-IR__TAO_OperationDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_OperationDef_Proxy_Broker *
+_TAO_OperationDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ ACE_UNUSED_ARG (obj);
-+ return ::POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::the_TAO_OperationDef_Strategized_Proxy_Broker();
+ ACE_UNUSED_ARG (obj);
+ return ::POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::the_TAO_OperationDef_Strategized_Proxy_Broker();
}
--CORBA::Any *
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+int
+ int
+-IR__TAO_OperationDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_OperationDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
-+ ACE_UNUSED_ARG (_dummy_);
+ ACE_UNUSED_ARG (_dummy_);
-- (*result_any) <<= this->_result;
+- IR__TAO_OperationDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_OperationDef_Proxy_Broker_Factory_function;
+ _TAO_OperationDef_Proxy_Broker_Factory_function_pointer =
+ _TAO_OperationDef_Proxy_Broker_Factory_function;
-- return safe_result_any._retn ();
-+ return 0;
+ return 0;
}
--char *
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
+-static int IR__TAO_OperationDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_OperationDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_OperationDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_OperationDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+ _TAO_OperationDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_OperationDef_Proxy_Broker_Factory_Initializer));
--CORBA::Boolean
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--void
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get::result (CORBA::TypeCode_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Proxy Implementation
-+//
-
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::SequenceDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
-+POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::_TAO_OperationDef_ThruPOA_Proxy_Impl (void)
- {}
-
--Dynamic::ParameterList *
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::~_TAO_OperationDef_ThruPOA_Proxy_Impl (void)
-+{}
+ ///////////////////////////////////////////////////////////////////////
+@@ -25205,7 +25114,7 @@
+ );
+ }
--Dynamic::ExceptionList *
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+// ThruPOA Implementation of the IDL interface methods
-
--CORBA::Any *
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+CORBA::TypeCode_ptr POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::result (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
-+ CORBA::TypeCode_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "result",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::OperationDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/OperationDef:1.0"
-+ )
-+ )->result (
-+ ACE_TRY_ENV
-+ );
- }
-
--char *
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR::IDLType_ptr POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::result_def (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+-IR::IDLType_ptr POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::result_def (
++IR_IDLType_ptr POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::result_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -25213,7 +25122,7 @@
+ CORBA::SystemException
+ ))
+ {
+- IR::IDLType_var _tao_retval;
+ IR_IDLType_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "result_def",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::OperationDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/OperationDef:1.0"
-+ )
-+ )->result_def (
-+ ACE_TRY_ENV
-+ );
- }
-
--CORBA::Boolean
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::result_def (
-+ CORBA_Object *_collocated_tao_target_,
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -25238,7 +25147,7 @@
+
+ void POA_IR::_TAO_OperationDef_ThruPOA_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
-+ ))
- {
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "result_def",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::OperationDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/OperationDef:1.0"
-+ )
-+ )->result_def (
-+ result_def,
-+ ACE_TRY_ENV
-+ );
-+ return;
- }
-
--void
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get::result (IR::IDLType_ptr result)
-+IR::ParDescriptionSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::params (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Update the result.
-- this->_result = result;
-+ IR_ParDescriptionSeq_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "params",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::OperationDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/OperationDef:1.0"
-+ )
-+ )->params (
-+ ACE_TRY_ENV
-+ );
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -25268,7 +25177,7 @@
+ return;
}
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::SequenceDef *tao_impl
-- ,
-- IR::IDLType_ptr element_type_def,
-- CORBA::Environment &
-+void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::params (
-+ CORBA_Object *_collocated_tao_target_,
+-IR::ParDescriptionSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::params (
++IR_ParDescriptionSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::params (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -25276,7 +25185,7 @@
+ CORBA::SystemException
+ ))
+ {
+- IR::ParDescriptionSeq_var _tao_retval;
++ IR_ParDescriptionSeq_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -25301,7 +25210,7 @@
+
+ void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::params (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::ParDescriptionSeq & params,
+ const IR_ParDescriptionSeq & params,
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA::Environment &ACE_TRY_ENV
)
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- element_type_def_ (element_type_def)
--{}
--
--Dynamic::ParameterList *
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_element_type_def = parameter_list->length ();
-- parameter_list->length (length_element_type_def + 1);
-- (*parameter_list)[length_element_type_def].argument <<= this->element_type_def_;
--
-- (*parameter_list)[length_element_type_def].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "params",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::OperationDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/OperationDef:1.0"
-+ )
-+ )->params (
-+ params,
-+ ACE_TRY_ENV
-+ );
-+ return;
- }
-
--Dynamic::ExceptionList *
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR::OperationMode POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::mode (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ IR_OperationMode _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "mode",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (_tao_retval);
-+ return ACE_reinterpret_cast (
-+ POA_IR::OperationDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/OperationDef:1.0"
-+ )
-+ )->mode (
-+ ACE_TRY_ENV
-+ );
+ ACE_THROW_SPEC ((
+@@ -25331,7 +25240,7 @@
+ return;
}
--CORBA::Any *
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::mode (
-+ CORBA_Object *_collocated_tao_target_,
+-IR::OperationMode POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::mode (
++IR_OperationMode POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::mode (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -25339,7 +25248,7 @@
+ CORBA::SystemException
+ ))
+ {
+- IR::OperationMode _tao_retval;
++ IR_OperationMode _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -25364,7 +25273,7 @@
+
+ void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::mode (
+ CORBA_Object *_collocated_tao_target_,
+- IR::OperationMode mode,
+ IR_OperationMode mode,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "mode",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::OperationDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/OperationDef:1.0"
-+ )
-+ )->mode (
-+ mode,
-+ ACE_TRY_ENV
-+ );
-+ return;
- }
-
--char *
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR::ContextIdSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::contexts (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ IR_ContextIdSeq_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "contexts",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::OperationDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/OperationDef:1.0"
-+ )
-+ )->contexts (
-+ ACE_TRY_ENV
-+ );
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -25394,7 +25303,7 @@
+ return;
}
--CORBA::Boolean
--POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_ArrayDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
--{
--private:
-- unsigned int hash (const char *str, unsigned int len);
--public:
-- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
--};
--/* starting time is 16:31:12 */
--/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ArrayDef_Perfect_Hash_OpTable -N lookup */
--unsigned int
--TAO_IR_ArrayDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
--{
-- static const unsigned char asso_values[] =
-- {
--#if defined (ACE_MVS)
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 0,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 0,
-- 22, 22, 0, 0, 0, 22, 0, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 5, 22, 22, 22, 22, 0, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22,
--#else
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 0, 22, 0, 22, 22,
-- 0, 0, 0, 22, 0, 22, 22, 22, 22, 22,
-- 22, 22, 22, 22, 22, 22, 5, 22, 22, 22,
-- 22, 0, 22, 22, 22, 22, 22, 22,
--#endif /* ACE_MVS */
-- };
-- return len + asso_values[str[len - 1]] + asso_values[str[0]];
--}
--
--const class TAO_operation_db_entry *
--TAO_IR_ArrayDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
--{
-- enum
-- {
-- TOTAL_KEYWORDS = 10,
-- MIN_WORD_LENGTH = 5,
-- MAX_WORD_LENGTH = 21,
-- MIN_HASH_VALUE = 5,
-- MAX_HASH_VALUE = 21,
-- HASH_VALUE_RANGE = 17,
-- DUPLICATES = 3
-- };
--
-- static const class TAO_operation_db_entry wordlist[] =
-- {
-- {"",0},{"",0},{"",0},{"",0},{"",0},
-- {"_is_a", &POA_IR::ArrayDef::_is_a_skel},
-- {"destroy", &POA_IR::ArrayDef::destroy_skel},
-- {"_get_type", &POA_IR::ArrayDef::_get_type_skel},
-- {"_get_length", &POA_IR::ArrayDef::_get_length_skel},
-- {"_set_length", &POA_IR::ArrayDef::_set_length_skel},
-- {"_get_def_kind", &POA_IR::ArrayDef::_get_def_kind_skel},
-- {"_get_element_type", &POA_IR::ArrayDef::_get_element_type_skel},
-- {"_non_existent", &POA_IR::ArrayDef::_non_existent_skel},
-- {"_get_element_type_def", &POA_IR::ArrayDef::_get_element_type_def_skel},
-- {"_set_element_type_def", &POA_IR::ArrayDef::_set_element_type_def_skel},
-- };
--
-- static const signed char lookup[] =
-- {
-- -1, -1, -1, -8, -2, 5, -1, 6, -1, 7, -1, -29, -1, 10,
-- -1, -1, -1, 11, 12, -13, -2, -23,
-- };
--
-- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-- {
-- unsigned int key = hash (str, len);
--
-- if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-- {
-- int slot = lookup[key];
--
-- if (slot >= 0 && slot < MAX_HASH_VALUE)
-- {
-- const char *s = wordlist[slot].opname_;
--
-- if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-- return &wordlist[slot];
-- }
-- else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-- return 0;
-- else
-- {
-- unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-- const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-- const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
--
-- while (--ptr >= base)
-- if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-- return ptr;
-- }
-- }
-- }
-- return 0;
--}
--/* ending time is 16:31:12 */
--static TAO_IR_ArrayDef_Perfect_Hash_OpTable tao_IR_ArrayDef_optable;
--
--
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Implementation
--//
--
--// Factory function Implementation.
--POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker *POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::the_TAO_ArrayDef_Strategized_Proxy_Broker (void)
--{
-- static POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker strategized_proxy_broker;
-- return &strategized_proxy_broker;
--}
--
--POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::_TAO_ArrayDef_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- this->proxy_cache_[i] = 0;
--
--}
--
--POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::~_TAO_ArrayDef_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- delete this->proxy_cache_[i];
--
--}
--
--IR::_TAO_ArrayDef_Proxy_Impl&
--POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::ArrayDef *object,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-- TAO_ORB_Core::collocation_strategy (object);
--
-- if (this->proxy_cache_[strategy] != 0)
-- return *this->proxy_cache_[strategy];
--
-- this->create_proxy (strategy, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
--
-- return *this->proxy_cache_[strategy];
--
--}
--
--void
--POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::create_proxy (
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
--
-- if (this->proxy_cache_[strategy] == 0)
-- {
-- switch (strategy)
-- {
-- case TAO_ORB_Core::THRU_POA_STRATEGY:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- case TAO_ORB_Core::REMOTE_STRATEGY:
-- default:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- ::IR::_TAO_ArrayDef_Remote_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- }
--
-- }
--}
--
--
--//
--// End Strategized Proxy Broker Implementation
--///////////////////////////////////////////////////////////////////////
--
--
--IR::_TAO_ArrayDef_Proxy_Broker *
--IR__TAO_ArrayDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
--{
-- ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::the_TAO_ArrayDef_Strategized_Proxy_Broker();
--}
--
--int
--IR__TAO_ArrayDef_Proxy_Broker_Factory_Initializer (long _dummy_)
--{
-- ACE_UNUSED_ARG (_dummy_);
--
-- IR__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_ArrayDef_Proxy_Broker_Factory_function;
--
-- return 0;
--}
--
--static int IR__TAO_ArrayDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_ArrayDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ArrayDef_Proxy_Broker_Factory_Initializer));
--
--
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Proxy Implementation
--//
--
--POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_TAO_ArrayDef_ThruPOA_Proxy_Impl (void)
--{}
--
--// ThruPOA Implementation of the IDL interface methods
--
--CORBA::ULong POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::length (
-+void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::contexts (
+-IR::ContextIdSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::contexts (
++IR_ContextIdSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::contexts (
CORBA_Object *_collocated_tao_target_,
-+ const IR_ContextIdSeq & contexts,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
+@@ -25402,7 +25311,7 @@
CORBA::SystemException
))
{
-- CORBA::ULong _tao_retval = 0;
-- ACE_UNUSED_ARG (_tao_retval);
+- IR::ContextIdSeq_var _tao_retval;
++ IR_ContextIdSeq_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "length",
-+ "contexts",
- forward_to.out (),
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (_tao_retval);
-- return ACE_reinterpret_cast (
-- POA_IR::ArrayDef_ptr,
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::OperationDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ArrayDef:1.0"
-+ "IDL:omg.org/IR/OperationDef:1.0"
- )
-- )->length (
-+ )->contexts (
-+ contexts,
- ACE_TRY_ENV
- );
-+ return;
- }
+@@ -25427,7 +25336,7 @@
--void POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::length (
-+IR::ExceptionDefSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::exceptions (
+ void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::contexts (
CORBA_Object *_collocated_tao_target_,
-- CORBA::ULong length,
+- const IR::ContextIdSeq & contexts,
++ const IR_ContextIdSeq & contexts,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
+@@ -25457,7 +25366,7 @@
+ return;
+ }
+
+-IR::ExceptionDefSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::exceptions (
++IR_ExceptionDefSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::exceptions (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -25465,7 +25374,7 @@
CORBA::SystemException
))
{
+- IR::ExceptionDefSeq_var _tao_retval;
+ IR_ExceptionDefSeq_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
+ ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "length",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::ArrayDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ArrayDef:1.0"
-- )
-- )->length (
-- length,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
--CORBA::TypeCode_ptr POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- CORBA::TypeCode_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "element_type",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ArrayDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ArrayDef:1.0"
-- )
-- )->element_type (
-- ACE_TRY_ENV
-- );
--}
--
--IR::IDLType_ptr POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- IR::IDLType_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "element_type_def",
-+ "exceptions",
- forward_to.out (),
- ACE_TRY_ENV
- );
- ACE_CHECK_RETURN (0);
- return ACE_reinterpret_cast (
-- POA_IR::ArrayDef_ptr,
-+ POA_IR::OperationDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ArrayDef:1.0"
-+ "IDL:omg.org/IR/OperationDef:1.0"
- )
-- )->element_type_def (
-+ )->exceptions (
- ACE_TRY_ENV
- );
- }
+@@ -25490,7 +25399,7 @@
--void POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
-+void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::exceptions (
+ void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::exceptions (
CORBA_Object *_collocated_tao_target_,
-- IR::IDLType_ptr element_type_def,
+- const IR::ExceptionDefSeq & exceptions,
+ const IR_ExceptionDefSeq & exceptions,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -21703,18 +14121,18 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "element_type_def",
-+ "exceptions",
- forward_to.out (),
- ACE_TRY_ENV
- );
- ACE_CHECK;
- ACE_reinterpret_cast (
-- POA_IR::ArrayDef_ptr,
-+ POA_IR::OperationDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ArrayDef:1.0"
-+ "IDL:omg.org/IR/OperationDef:1.0"
- )
-- )->element_type_def (
-- element_type_def,
-+ )->exceptions (
-+ exceptions,
- ACE_TRY_ENV
- );
- return;
-@@ -21725,1013 +14143,527 @@
- ///////////////////////////////////////////////////////////////////////
-
- // skeleton constructor
--POA_IR::ArrayDef::ArrayDef (void)
-+POA_IR::OperationDef::OperationDef (void)
- {
-- this->optable_ = &tao_IR_ArrayDef_optable;
-+ this->optable_ = &tao_IR_OperationDef_optable;
- }
-
+@@ -25533,7 +25442,7 @@
// copy ctor
--POA_IR::ArrayDef::ArrayDef (const ArrayDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+ POA_IR::OperationDef::OperationDef (const OperationDef& rhs)
+ : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+POA_IR::OperationDef::OperationDef (const OperationDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ POA_CORBA_IRObject (rhs),
TAO_ServantBase (rhs)
{}
- // skeleton destructor
--POA_IR::ArrayDef::~ArrayDef (void)
-+POA_IR::OperationDef::~OperationDef (void)
+@@ -25631,7 +25540,7 @@
{
- }
-
--void POA_IR::ArrayDef::_get_length_skel (
-+void POA_IR::OperationDef::_get_result_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *)_tao_object_reference;
-+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
-
-- CORBA::ULong _tao_retval = 0;
-+ CORBA::TypeCode_var _tao_retval;
+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
+
+- IR::IDLType_var _tao_retval;
++ IR_IDLType_var _tao_retval;
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->result (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->length (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::ULong _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -25658,7 +25567,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -25712,14 +25621,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+- IR::IDLType_var result_def;
++ IR_IDLType_var result_def;
if (!(
-- (_tao_out << _tao_retval)
-+ (_tao_out << _tao_retval.in ())
+ (_tao_in >> result_def.out ())
))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void POA_IR::ArrayDef::_set_length_skel (
-+void POA_IR::OperationDef::_get_result_def_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- CORBA::ULong length;
-- if (!(
-- (_tao_in >> length)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
+ ACE_THROW (CORBA::MARSHAL());
-+ IR_IDLType_var _tao_retval;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- length,
-+ _tao_retval = _tao_impl->result_def (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->length (
-- length,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void POA_IR::ArrayDef::_get_element_type_skel (
-+void POA_IR::OperationDef::_set_result_def_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *)_tao_object_reference;
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
-
-- CORBA::TypeCode_var _tao_retval;
-+ IR_IDLType_var result_def;
-+ if (!(
-+ (_tao_in >> result_def.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_impl->result_def (
-+ result_def.in (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
-
-- _tao_impl->element_type (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-
-+ _tao_server_request.init_reply ();
- }
-
--void POA_IR::ArrayDef::_get_element_type_def_skel (
-+void POA_IR::OperationDef::_get_params_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -25790,7 +25697,7 @@
{
-- POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *)_tao_object_reference;
-+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
-
-- IR::IDLType_var _tao_retval;
+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
+
+- IR::ParDescriptionSeq_var _tao_retval;
+ IR_ParDescriptionSeq_var _tao_retval;
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->params (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->element_type_def (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
- (_tao_out << _tao_retval.in ())
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void POA_IR::ArrayDef::_set_element_type_def_skel (
-+void POA_IR::OperationDef::_set_params_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -25817,7 +25724,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ParDescriptionSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_ParDescriptionSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -25871,14 +25778,12 @@
TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *)_tao_object_reference;
-+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
-
--_tao_server_request.argument_flag (0);
-- IR::IDLType_var element_type_def;
+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+- IR::ParDescriptionSeq params;
+ IR_ParDescriptionSeq params;
if (!(
-- (_tao_in >> element_type_def.out ())
-+ (_tao_in >> params)
+ (_tao_in >> params)
))
-- ACE_THROW (CORBA::MARSHAL());
-+ ACE_THROW (CORBA::MARSHAL () );
+ ACE_THROW (CORBA::MARSHAL());
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- element_type_def.in (),
-+ _tao_impl->params (
-+ params,
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->element_type_def (
-- element_type_def.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
-
--void POA_IR::ArrayDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = 0;
-- CORBA::String_var value;
-- if (!(_tao_in >> value.out ()))
-- ACE_THROW (CORBA::MARSHAL ());
--
-- _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
- }
-
--void POA_IR::ArrayDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-+void POA_IR::OperationDef::_get_mode_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -25949,7 +25854,7 @@
{
-- POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
-+
+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
+
+- IR::OperationMode _tao_retval;
+ IR_OperationMode _tao_retval;
-+
-+ _tao_retval = _tao_impl->mode (
-+ ACE_TRY_ENV
-+ );
-+
- ACE_CHECK;
--
-+
- _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
-+ if (!(
-+ (_tao_out << _tao_retval)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--CORBA::Boolean POA_IR::ArrayDef::_is_a (
-- const char* value,
-+void POA_IR::OperationDef::_set_mode_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
- 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-- return 1;
-- else
-- return 0;
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
--void* POA_IR::ArrayDef::_downcast (
-- const char* logical_type_id
-- )
--{
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ArrayDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::ArrayDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-- return ACE_static_cast (POA_IR::IDLType_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-- return ACE_static_cast(PortableServer::Servant, this);
-- return 0;
--}
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -25976,7 +25881,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::OperationMode _tao_retval_info = _tao_retval;
++ IR_OperationMode _tao_retval_info = _tao_retval;
+ ri.result (_tao_retval_info);
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+ _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+@@ -26029,14 +25934,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+- IR::OperationMode mode;
+ IR_OperationMode mode;
-+ if (!(
-+ (_tao_in >> mode)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--void POA_IR::ArrayDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
--{
-- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
--}
-+ _tao_impl->mode (
-+ mode,
-+ ACE_TRY_ENV
-+ );
-
--const char* POA_IR::ArrayDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/ArrayDef:1.0";
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
- }
+ if (!(
+ (_tao_in >> mode)
+ ))
+ ACE_THROW (CORBA::MARSHAL());
--IR::ArrayDef*
--POA_IR::ArrayDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+void POA_IR::OperationDef::_get_contexts_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -26107,7 +26010,7 @@
{
-- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Object_ptr tmp = CORBA::Object::_nil ();
--
-- if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-- else
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
--
-- CORBA::Object_var obj = tmp;
-- return ::IR::ArrayDef::_unchecked_narrow (obj.in ());
--}
-+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
-
+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
+
+- IR::ContextIdSeq_var _tao_retval;
+ IR_ContextIdSeq_var _tao_retval;
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::TAO_ServerRequestInfo_IR_ArrayDef_length_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ArrayDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
-+ _tao_retval = _tao_impl->contexts (
-+ ACE_TRY_ENV
-+ );
-
--Dynamic::ParameterList *
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+ ACE_CHECK;
-
--Dynamic::ExceptionList *
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--CORBA::Any *
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::OperationDef::_set_contexts_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
-
--char *
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -26134,7 +26037,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ContextIdSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_ContextIdSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -26188,14 +26091,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+- IR::ContextIdSeq contexts;
+ IR_ContextIdSeq contexts;
-+ if (!(
-+ (_tao_in >> contexts)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--CORBA::Boolean
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+ _tao_impl->contexts (
-+ contexts,
-+ ACE_TRY_ENV
-+ );
-
--void
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::result (CORBA::ULong result)
--{
-- // Update the result.
-- this->_result = result;
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
- }
+ if (!(
+ (_tao_in >> contexts)
+ ))
+ ACE_THROW (CORBA::MARSHAL());
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_set::TAO_ServerRequestInfo_IR_ArrayDef_length_set (
-+void POA_IR::OperationDef::_get_exceptions_skel (
- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ArrayDef *tao_impl
-- ,
-- const CORBA::ULong & length,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- length_ (length)
--{}
-
--Dynamic::ParameterList *
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_length = parameter_list->length ();
-- parameter_list->length (length_length + 1);
-- (*parameter_list)[length_length].argument <<= length_;
-- (*parameter_list)[length_length].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
-
--Dynamic::ExceptionList *
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -26266,7 +26167,7 @@
+ {
+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
+
+- IR::ExceptionDefSeq_var _tao_retval;
+ IR_ExceptionDefSeq_var _tao_retval;
--CORBA::Any *
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
-+ _tao_retval = _tao_impl->exceptions (
-+ ACE_TRY_ENV
-+ );
-
--char *
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ ACE_CHECK;
-
--CORBA::Boolean
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get (
-+void POA_IR::OperationDef::_set_exceptions_skel (
- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ArrayDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
-
--Dynamic::ExceptionList *
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -26293,7 +26194,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ExceptionDefSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_ExceptionDefSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -26347,14 +26248,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+- IR::ExceptionDefSeq exceptions;
+ IR_ExceptionDefSeq exceptions;
-+ if (!(
-+ (_tao_in >> exceptions)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--CORBA::Any *
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+ _tao_impl->exceptions (
-+ exceptions,
-+ ACE_TRY_ENV
-+ );
-
--char *
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ ACE_CHECK;
+ if (!(
+ (_tao_in >> exceptions)
+ ))
+ ACE_THROW (CORBA::MARSHAL());
--CORBA::Boolean
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ _tao_server_request.init_reply ();
- }
-
--void
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get::result (CORBA::TypeCode_ptr result)
-+void POA_IR::OperationDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- // Update the result.
-- this->_result = result;
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = 0;
-+ CORBA::String_var value;
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -26427,7 +26326,7 @@
+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *) _tao_object_reference;
+ CORBA::Boolean _tao_retval = 0;
+ CORBA::String_var value;
+- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
-+ ACE_THROW (CORBA::MARSHAL ());
-+
-+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+ ACE_THROW (CORBA::MARSHAL ());
+
+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+@@ -26435,7 +26334,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (CORBA::MARSHAL ());
}
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get (
-+void POA_IR::OperationDef::_non_existent_skel (
- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ArrayDef *tao_impl
-- ,
-- CORBA::Environment &
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+ POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-+ ACE_CHECK;
-
--Dynamic::ExceptionList *
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+@@ -26452,7 +26351,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Any *
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+CORBA::Boolean POA_IR::OperationDef::_is_a (
-+ const char* value,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
-+ 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-+ return 1;
-+ else
-+ return 0;
- }
-
--char *
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void* POA_IR::OperationDef::_downcast (
-+ const char* logical_type_id
-+ )
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/OperationDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::OperationDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Contained_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+@@ -26480,7 +26379,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
+ return ACE_static_cast (POA_IR::Contained_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-+ return ACE_static_cast(PortableServer::Servant, this);
-+ return 0;
- }
-
--CORBA::Boolean
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::OperationDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--void
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get::result (IR::IDLType_ptr result)
-+const char* POA_IR::OperationDef::_interface_repository_id (void) const
- {
-- // Update the result.
-- this->_result = result;
-+ return "IDL:omg.org/IR/OperationDef:1.0";
- }
-
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ArrayDef *tao_impl
-- ,
-- IR::IDLType_ptr element_type_def,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- element_type_def_ (element_type_def)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR::OperationDef*
-+POA_IR::OperationDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-+ TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+ return ACE_static_cast(PortableServer::Servant, this);
+ return 0;
+@@ -26510,10 +26409,9 @@
+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_element_type_def = parameter_list->length ();
-- parameter_list->length (length_element_type_def + 1);
-- (*parameter_list)[length_element_type_def].argument <<= this->element_type_def_;
-+ CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
-- (*parameter_list)[length_element_type_def].mode = Dynamic::PARAM_IN;
-+ if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-+ else
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-
-- return safe_parameter_list._retn ();
-+ CORBA::Object_var obj = tmp;
+ CORBA::Object_var obj = tmp;
+- return ::IR::OperationDef::_unchecked_narrow (obj.in ());
+ return IR_OperationDef::_unchecked_narrow (obj.in ());
}
--Dynamic::ExceptionList *
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-
--CORBA::Boolean
--POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_ExceptionDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+class TAO_IR_InterfaceDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::TAO_ServerRequestInfo_IR_OperationDef_result_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -26668,7 +26566,7 @@
+ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_set::TAO_ServerRequestInfo_IR_OperationDef_result_def_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::OperationDef *tao_impl,
+- IR::IDLType_ptr result_def,
++ IR_IDLType_ptr result_def,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -26817,7 +26715,7 @@
+ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_set::TAO_ServerRequestInfo_IR_OperationDef_params_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::OperationDef *tao_impl,
+- const IR::ParDescriptionSeq & params,
++ const IR_ParDescriptionSeq & params,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -26966,7 +26864,7 @@
+ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_set::TAO_ServerRequestInfo_IR_OperationDef_mode_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::OperationDef *tao_impl,
+- IR::OperationMode & mode,
++ IR_OperationMode & mode,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -27115,7 +27013,7 @@
+ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_set::TAO_ServerRequestInfo_IR_OperationDef_contexts_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::OperationDef *tao_impl,
+- const IR::ContextIdSeq & contexts,
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -27264,7 +27162,7 @@
+ POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::OperationDef *tao_impl,
+- const IR::ExceptionDefSeq & exceptions,
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -27336,6 +27234,7 @@
+ }
+
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_InterfaceDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
private:
- unsigned int hash (const char *str, unsigned int len);
+@@ -27343,7 +27242,7 @@
public:
const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
};
--/* starting time is 16:31:12 */
+-/* starting time is 18:47:28 */
+/* starting time is 11:23:10 */
/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ExceptionDef_Perfect_Hash_OpTable -N lookup */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_InterfaceDef_Perfect_Hash_OpTable -N lookup */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_InterfaceDef_Perfect_Hash_OpTable -N lookup */
unsigned int
--TAO_IR_ExceptionDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+TAO_IR_InterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
- static const unsigned char asso_values[] =
- {
- #if defined (ACE_MVS)
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 0,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 0,
-- 52, 20, 3, 0, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 10, 15, 5,
-- 52, 10, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 15, 15, 52, 52, 52, 15, 5, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 0,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 0,
-+ 66, 20, 8, 0, 66, 66, 66, 10, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 0, 0, 5,
-+ 66, 0, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 10, 30, 66, 66, 66, 20, 25, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66,
- #else
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-- 52, 52, 52, 52, 52, 0, 52, 0, 52, 20,
-- 3, 0, 52, 52, 52, 52, 52, 52, 10, 15,
-- 5, 52, 10, 52, 52, 15, 15, 52, 52, 52,
-- 15, 5, 52, 52, 52, 52, 52, 52,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-+ 66, 66, 66, 66, 66, 0, 66, 0, 66, 20,
-+ 8, 0, 66, 66, 66, 10, 66, 66, 0, 0,
-+ 5, 66, 0, 66, 66, 10, 30, 66, 66, 66,
-+ 20, 25, 66, 66, 66, 66, 66, 66,
- #endif /* ACE_MVS */
- };
- return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
- const class TAO_operation_db_entry *
--TAO_IR_ExceptionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+TAO_IR_InterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
- enum
- {
-- TOTAL_KEYWORDS = 33,
-+ TOTAL_KEYWORDS = 40,
- MIN_WORD_LENGTH = 4,
- MAX_WORD_LENGTH = 26,
-- MIN_HASH_VALUE = 5,
-- MAX_HASH_VALUE = 51,
-- HASH_VALUE_RANGE = 47,
-- DUPLICATES = 7
-+ MIN_HASH_VALUE = 4,
-+ MAX_HASH_VALUE = 65,
-+ HASH_VALUE_RANGE = 62,
-+ DUPLICATES = 11
- };
-
- static const class TAO_operation_db_entry wordlist[] =
- {
-- {"",0},{"",0},{"",0},{"",0},{"",0},
-- {"_is_a", &POA_IR::ExceptionDef::_is_a_skel},
-- {"_get_type", &POA_IR::ExceptionDef::_get_type_skel},
-- {"_set_name", &POA_IR::ExceptionDef::_set_name_skel},
-- {"_get_name", &POA_IR::ExceptionDef::_get_name_skel},
-- {"_get_id", &POA_IR::ExceptionDef::_get_id_skel},
-- {"_set_id", &POA_IR::ExceptionDef::_set_id_skel},
-- {"describe", &POA_IR::ExceptionDef::describe_skel},
-- {"destroy", &POA_IR::ExceptionDef::destroy_skel},
-- {"_get_def_kind", &POA_IR::ExceptionDef::_get_def_kind_skel},
-- {"_get_version", &POA_IR::ExceptionDef::_get_version_skel},
-- {"_set_version", &POA_IR::ExceptionDef::_set_version_skel},
-- {"_get_absolute_name", &POA_IR::ExceptionDef::_get_absolute_name_skel},
-- {"move", &POA_IR::ExceptionDef::move_skel},
-- {"_get_defined_in", &POA_IR::ExceptionDef::_get_defined_in_skel},
-- {"lookup_name", &POA_IR::ExceptionDef::lookup_name_skel},
-- {"lookup", &POA_IR::ExceptionDef::lookup_skel},
-- {"_get_members", &POA_IR::ExceptionDef::_get_members_skel},
-- {"_set_members", &POA_IR::ExceptionDef::_set_members_skel},
-- {"_non_existent", &POA_IR::ExceptionDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::ExceptionDef::_get_containing_repository_skel},
-- {"create_value", &POA_IR::ExceptionDef::create_value_skel},
-- {"create_module", &POA_IR::ExceptionDef::create_module_skel},
-- {"create_native", &POA_IR::ExceptionDef::create_native_skel},
-- {"describe_contents", &POA_IR::ExceptionDef::describe_contents_skel},
-- {"create_interface", &POA_IR::ExceptionDef::create_interface_skel},
-- {"create_union", &POA_IR::ExceptionDef::create_union_skel},
-- {"create_exception", &POA_IR::ExceptionDef::create_exception_skel},
-- {"contents", &POA_IR::ExceptionDef::contents_skel},
-- {"create_enum", &POA_IR::ExceptionDef::create_enum_skel},
-- {"create_alias", &POA_IR::ExceptionDef::create_alias_skel},
-- {"create_struct", &POA_IR::ExceptionDef::create_struct_skel},
-- {"create_constant", &POA_IR::ExceptionDef::create_constant_skel},
-- {"create_value_box", &POA_IR::ExceptionDef::create_value_box_skel},
-+ {"",0},{"",0},{"",0},{"",0},
-+ {"move", &POA_IR::InterfaceDef::move_skel},
-+ {"_is_a", &POA_IR::InterfaceDef::_is_a_skel},
-+ {"lookup", &POA_IR::InterfaceDef::lookup_skel},
-+ {"_get_name", &POA_IR::InterfaceDef::_get_name_skel},
-+ {"_get_type", &POA_IR::InterfaceDef::_get_type_skel},
-+ {"_set_name", &POA_IR::InterfaceDef::_set_name_skel},
-+ {"lookup_name", &POA_IR::InterfaceDef::lookup_name_skel},
-+ {"_get_is_local", &POA_IR::InterfaceDef::_get_is_local_skel},
-+ {"_set_is_local", &POA_IR::InterfaceDef::_set_is_local_skel},
-+ {"is_a", &POA_IR::InterfaceDef::is_a_skel},
-+ {"_get_id", &POA_IR::InterfaceDef::_get_id_skel},
-+ {"_set_id", &POA_IR::InterfaceDef::_set_id_skel},
-+ {"describe", &POA_IR::InterfaceDef::describe_skel},
-+ {"_get_version", &POA_IR::InterfaceDef::_get_version_skel},
-+ {"_set_version", &POA_IR::InterfaceDef::_set_version_skel},
-+ {"_get_absolute_name", &POA_IR::InterfaceDef::_get_absolute_name_skel},
-+ {"_get_defined_in", &POA_IR::InterfaceDef::_get_defined_in_skel},
-+ {"_get_def_kind", &POA_IR::InterfaceDef::_get_def_kind_skel},
-+ {"_get_base_interfaces", &POA_IR::InterfaceDef::_get_base_interfaces_skel},
-+ {"_set_base_interfaces", &POA_IR::InterfaceDef::_set_base_interfaces_skel},
-+ {"create_enum", &POA_IR::InterfaceDef::create_enum_skel},
-+ {"create_value", &POA_IR::InterfaceDef::create_value_skel},
-+ {"create_module", &POA_IR::InterfaceDef::create_module_skel},
-+ {"create_native", &POA_IR::InterfaceDef::create_native_skel},
-+ {"describe_contents", &POA_IR::InterfaceDef::describe_contents_skel},
-+ {"create_attribute", &POA_IR::InterfaceDef::create_attribute_skel},
-+ {"create_interface", &POA_IR::InterfaceDef::create_interface_skel},
-+ {"create_union", &POA_IR::InterfaceDef::create_union_skel},
-+ {"contents", &POA_IR::InterfaceDef::contents_skel},
-+ {"destroy", &POA_IR::InterfaceDef::destroy_skel},
-+ {"create_operation", &POA_IR::InterfaceDef::create_operation_skel},
-+ {"create_exception", &POA_IR::InterfaceDef::create_exception_skel},
-+ {"create_alias", &POA_IR::InterfaceDef::create_alias_skel},
-+ {"_non_existent", &POA_IR::InterfaceDef::_non_existent_skel},
-+ {"_get_is_abstract", &POA_IR::InterfaceDef::_get_is_abstract_skel},
-+ {"_set_is_abstract", &POA_IR::InterfaceDef::_set_is_abstract_skel},
-+ {"_get_containing_repository", &POA_IR::InterfaceDef::_get_containing_repository_skel},
-+ {"create_value_box", &POA_IR::InterfaceDef::create_value_box_skel},
-+ {"create_struct", &POA_IR::InterfaceDef::create_struct_skel},
-+ {"create_constant", &POA_IR::InterfaceDef::create_constant_skel},
- };
-
- static const signed char lookup[] =
- {
-- -1, -1, -1, -6, -3, 5, -1, -9, -2, -57, -54, 11, -1, -14,
-- -2, 12, 13, -55, 16, 17, 18, 19, -1, -1, -21, -2, 20, -54,
-- 23, -26, -2, 24, 25, -55, -1, 28, 29, 30, -1, -1, -1, 31,
-- -1, 32, -1, -1, 33, 34, 35, -1, 36, 37,
-+ -11, -2, -14, -2, 4, 5, 6, -17, -2, 103, -1, 10, -1, -78,
-+ 13, -78, 16, -75, 19, -1, 20, 21, -22, -2, -26, -2, -29, -2,
-+ -34, -2, -73, 24, 25, -74, -1, 28, -75, 31, 32, -1, 33, -78,
-+ 36, 37, -38, -2, -67, -7, -3, -1, -1, 40, -1, -1, -1, -1,
-+ 41, -1, -1, -1, -1, -1, -1, 42, -1, 43,
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -22765,38 +14697,37 @@
+@@ -27496,10 +27395,9 @@
}
return 0;
}
--/* ending time is 16:31:12 */
--static TAO_IR_ExceptionDef_Perfect_Hash_OpTable tao_IR_ExceptionDef_optable;
--
+-/* ending time is 18:47:28 */
+/* ending time is 11:23:10 */
-+static TAO_IR_InterfaceDef_Perfect_Hash_OpTable tao_IR_InterfaceDef_optable;
+ static TAO_IR_InterfaceDef_Perfect_Hash_OpTable tao_IR_InterfaceDef_optable;
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Implementation
//
-
- // Factory function Implementation.
--POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker *POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::the_TAO_ExceptionDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker *POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::the_TAO_InterfaceDef_Strategized_Proxy_Broker (void)
- {
-- static POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ static POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker strategized_proxy_broker;
- return &strategized_proxy_broker;
- }
-
--POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::_TAO_ExceptionDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::_TAO_InterfaceDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- this->proxy_cache_[i] = 0;
-
- }
-
--POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::~_TAO_ExceptionDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::~_TAO_InterfaceDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- delete this->proxy_cache_[i];
+@@ -27525,9 +27423,9 @@
}
--IR::_TAO_ExceptionDef_Proxy_Impl&
--POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::ExceptionDef *object,
+-IR::_TAO_InterfaceDef_Proxy_Impl&
+_TAO_InterfaceDef_Proxy_Impl&
-+POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::select_proxy (
+ POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::InterfaceDef *object,
+ IR_InterfaceDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -22814,7 +14745,7 @@
- }
-
- void
--POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::create_proxy (
-+POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::create_proxy (
- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -22828,7 +14759,7 @@
+@@ -27559,7 +27457,7 @@
case TAO_ORB_Core::THRU_POA_STRATEGY:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
-- POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl,
+- POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl,
+ _TAO_InterfaceDef_ThruPOA_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -22838,7 +14769,7 @@
+@@ -27569,7 +27467,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
-- ::IR::_TAO_ExceptionDef_Remote_Proxy_Impl,
+- ::IR::_TAO_InterfaceDef_Remote_Proxy_Impl,
+ _TAO_InterfaceDef_Remote_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -22855,38 +14786,41 @@
+@@ -27586,26 +27484,26 @@
///////////////////////////////////////////////////////////////////////
--IR::_TAO_ExceptionDef_Proxy_Broker *
--IR__TAO_ExceptionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+-IR::_TAO_InterfaceDef_Proxy_Broker *
+-IR__TAO_InterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_InterfaceDef_Proxy_Broker *
+_TAO_InterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::the_TAO_ExceptionDef_Strategized_Proxy_Broker();
-+ return ::POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::the_TAO_InterfaceDef_Strategized_Proxy_Broker();
+ return ::POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::the_TAO_InterfaceDef_Strategized_Proxy_Broker();
}
int
--IR__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+-IR__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
ACE_UNUSED_ARG (_dummy_);
-- IR__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_ExceptionDef_Proxy_Broker_Factory_function;
+- IR__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_InterfaceDef_Proxy_Broker_Factory_function;
+ _TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer =
+ _TAO_InterfaceDef_Proxy_Broker_Factory_function;
return 0;
}
--static int IR__TAO_ExceptionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer));
+-static int IR__TAO_InterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_InterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+ _TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_InterfaceDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
- // ThruPOA Proxy Implementation
- //
-
--POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_TAO_ExceptionDef_ThruPOA_Proxy_Impl (void)
-+POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_TAO_InterfaceDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::~_TAO_InterfaceDef_ThruPOA_Proxy_Impl (void)
- {}
+@@ -27617,7 +27515,7 @@
// ThruPOA Implementation of the IDL interface methods
--CORBA::TypeCode_ptr POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::type (
-+IR::InterfaceDefSeq * POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
+-IR::InterfaceDefSeq * POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
++IR_InterfaceDefSeq * POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -22894,7 +14828,7 @@
+@@ -27625,7 +27523,7 @@
CORBA::SystemException
))
{
-- CORBA::TypeCode_var _tao_retval;
+- IR::InterfaceDefSeq_var _tao_retval;
+ IR_InterfaceDefSeq_var _tao_retval;
ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -22902,935 +14836,982 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "type",
-+ "base_interfaces",
- forward_to.out (),
- ACE_TRY_ENV
- );
- ACE_CHECK_RETURN (0);
- return ACE_reinterpret_cast (
-- POA_IR::ExceptionDef_ptr,
-+ POA_IR::InterfaceDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ExceptionDef:1.0"
-+ "IDL:omg.org/IR/InterfaceDef:1.0"
- )
-- )->type (
-+ )->base_interfaces (
- ACE_TRY_ENV
- );
- }
+@@ -27650,7 +27548,7 @@
--IR::StructMemberSeq * POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::members (
-+void POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
+ void POA_IR::_TAO_InterfaceDef_ThruPOA_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
- ))
- {
-- IR::StructMemberSeq_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
- TAO_Object_Adapter::Servant_Upcall servant_upcall (
- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "members",
-+ "base_interfaces",
- forward_to.out (),
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ExceptionDef_ptr,
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::InterfaceDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ExceptionDef:1.0"
-+ "IDL:omg.org/IR/InterfaceDef:1.0"
- )
-- )->members (
-+ )->base_interfaces (
-+ base_interfaces,
- ACE_TRY_ENV
+@@ -27839,22 +27737,22 @@
);
-+ return;
}
--void POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::members (
-+CORBA::Boolean POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_abstract (
+-IR::AttributeDef_ptr POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
++IR_AttributeDef_ptr POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
CORBA_Object *_collocated_tao_target_,
-- const IR::StructMemberSeq & members,
+ 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
))
{
-+ CORBA::Boolean _tao_retval = 0;
-+ ACE_UNUSED_ARG (_tao_retval);
+- IR::AttributeDef_var _tao_retval;
++ IR_AttributeDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "members",
-+ "is_abstract",
- forward_to.out (),
- ACE_TRY_ENV
- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::ExceptionDef_ptr,
-+ ACE_CHECK_RETURN (_tao_retval);
-+ return ACE_reinterpret_cast (
-+ POA_IR::InterfaceDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ExceptionDef:1.0"
-+ "IDL:omg.org/IR/InterfaceDef:1.0"
- )
-- )->members (
-- members,
-+ )->is_abstract (
- ACE_TRY_ENV
- );
-- return;
--}
--
--//
--// End ThruPOA Proxy Implementation
--///////////////////////////////////////////////////////////////////////
--
--// skeleton constructor
--POA_IR::ExceptionDef::ExceptionDef (void)
--{
-- this->optable_ = &tao_IR_ExceptionDef_optable;
- }
-
--// copy ctor
--POA_IR::ExceptionDef::ExceptionDef (const ExceptionDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-- ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-- TAO_ServantBase (rhs)
--{}
--
--// skeleton destructor
--POA_IR::ExceptionDef::~ExceptionDef (void)
--{
--}
--
--void POA_IR::ExceptionDef::_get_type_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+void POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_abstract (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Boolean is_abstract,
- CORBA::Environment &ACE_TRY_ENV
- )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- POA_IR::ExceptionDef *_tao_impl = (POA_IR::ExceptionDef *)_tao_object_reference;
--
-- CORBA::TypeCode_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "is_abstract",
-+ forward_to.out (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->type (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::InterfaceDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/InterfaceDef:1.0"
-+ )
-+ )->is_abstract (
-+ is_abstract,
- ACE_TRY_ENV
- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ return;
- }
-
--void POA_IR::ExceptionDef::_get_members_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+CORBA::Boolean POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_local (
-+ CORBA_Object *_collocated_tao_target_,
- CORBA::Environment &ACE_TRY_ENV
- )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- POA_IR::ExceptionDef *_tao_impl = (POA_IR::ExceptionDef *)_tao_object_reference;
--
-- IR::StructMemberSeq_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ CORBA::Boolean _tao_retval = 0;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "is_local",
-+ forward_to.out (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->members (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::StructMemberSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-+ ACE_CHECK_RETURN (_tao_retval);
-+ return ACE_reinterpret_cast (
-+ POA_IR::InterfaceDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/InterfaceDef:1.0"
-+ )
-+ )->is_local (
- ACE_TRY_ENV
+@@ -27884,23 +27782,23 @@
);
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
}
--void POA_IR::ExceptionDef::_set_members_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+void POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_local (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Boolean is_local,
- CORBA::Environment &ACE_TRY_ENV
- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ExceptionDef *_tao_impl = (POA_IR::ExceptionDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- IR::StructMemberSeq members;
-- if (!(
-- (_tao_in >> members)
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-+{
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
--
-- POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- members,
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "is_local",
-+ forward_to.out (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->members (
-- members,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::InterfaceDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/InterfaceDef:1.0"
-+ )
-+ )->is_local (
-+ is_local,
- ACE_TRY_ENV
- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+ return;
- }
-
--void POA_IR::ExceptionDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-+CORBA::Boolean POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * interface_id,
- CORBA::Environment &ACE_TRY_ENV
- )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ExceptionDef *_tao_impl = (POA_IR::ExceptionDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = 0;
-- CORBA::String_var value;
-- if (!(_tao_in >> value.out ()))
-- ACE_THROW (CORBA::MARSHAL ());
--
-- _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
-+ CORBA::Boolean _tao_retval = 0;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "is_a",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (_tao_retval);
-+ return ACE_reinterpret_cast (
-+ POA_IR::InterfaceDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/InterfaceDef:1.0"
-+ )
-+ )->is_a (
-+ interface_id,
-+ ACE_TRY_ENV
-+ );
- }
-
--void POA_IR::ExceptionDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-+IR::AttributeDef_ptr POA_IR::_TAO_InterfaceDef_ThruPOA_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,
- CORBA::Environment &ACE_TRY_ENV
- )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- POA_IR::ExceptionDef *_tao_impl = (POA_IR::ExceptionDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
-+ IR_AttributeDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_attribute",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::InterfaceDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/InterfaceDef:1.0"
-+ )
-+ )->create_attribute (
-+ id,
-+ name,
-+ version,
-+ type,
-+ mode,
-+ get_exceptions,
-+ put_exceptions,
-+ ACE_TRY_ENV
-+ );
- }
-
--CORBA::Boolean POA_IR::ExceptionDef::_is_a (
-- const char* value,
-+IR::OperationDef_ptr POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_operation (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * id,
-+ const char * name,
-+ const char * version,
+-IR::OperationDef_ptr POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_operation (
++IR_OperationDef_ptr POA_IR::_TAO_InterfaceDef_ThruPOA_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,
@@ -29684,1208 +6764,364 @@
+ const IR_ContextIdSeq & contexts,
CORBA::Environment &ACE_TRY_ENV
)
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-- return 1;
-- else
-- return 0;
-+ IR_OperationDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_operation",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::InterfaceDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/InterfaceDef:1.0"
-+ )
-+ )->create_operation (
-+ id,
-+ name,
-+ version,
-+ result,
-+ mode,
-+ params,
-+ exceptions,
-+ contexts,
-+ ACE_TRY_ENV
-+ );
- }
-
--void* POA_IR::ExceptionDef::_downcast (
-- const char* logical_type_id
-- )
--{
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ExceptionDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::ExceptionDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-- return ACE_static_cast (POA_IR::Contained_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-- return ACE_static_cast (POA_IR::Container_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-- return ACE_static_cast(PortableServer::Servant, this);
-- return 0;
--}
-+//
-+// End ThruPOA Proxy Implementation
-+///////////////////////////////////////////////////////////////////////
-
--void POA_IR::ExceptionDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+// skeleton constructor
-+POA_IR::InterfaceDef::InterfaceDef (void)
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
{
-- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
-+ this->optable_ = &tao_IR_InterfaceDef_optable;
- }
-
--const char* POA_IR::ExceptionDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/ExceptionDef:1.0";
--}
-+// copy ctor
-+POA_IR::InterfaceDef::InterfaceDef (const InterfaceDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+- IR::OperationDef_var _tao_retval;
++ IR_OperationDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -27946,7 +27844,7 @@
+ : ACE_NESTED_CLASS (POA_IR,Container) (rhs),
+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+ POA_CORBA_IRObject (rhs),
-+ TAO_ServantBase (rhs)
-+{}
+ TAO_ServantBase (rhs)
+ {}
--IR::ExceptionDef*
--POA_IR::ExceptionDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+// skeleton destructor
-+POA_IR::InterfaceDef::~InterfaceDef (void)
+@@ -27964,7 +27862,7 @@
{
-- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Object_ptr tmp = CORBA::Object::_nil ();
--
-- if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-- else
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
--
-- CORBA::Object_var obj = tmp;
-- return ::IR::ExceptionDef::_unchecked_narrow (obj.in ());
- }
-
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::TAO_ServerRequestInfo_IR_ExceptionDef_type_get (
-+void POA_IR::InterfaceDef::_get_base_interfaces_skel (
- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ExceptionDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+ POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
-
--Dynamic::ExceptionList *
--POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
+ POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
+
+- IR::InterfaceDefSeq_var _tao_retval;
+ IR_InterfaceDefSeq_var _tao_retval;
--CORBA::Any *
--POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+ _tao_retval = _tao_impl->base_interfaces (
-+ ACE_TRY_ENV
-+ );
-
--char *
--POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ ACE_CHECK;
-
--CORBA::Boolean
--POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void
--POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::result (CORBA::TypeCode_ptr result)
-+void POA_IR::InterfaceDef::_set_base_interfaces_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Update the result.
-- this->_result = result;
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
-
--POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get::TAO_ServerRequestInfo_IR_ExceptionDef_members_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ExceptionDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -27991,7 +27889,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -28045,14 +27943,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+- IR::InterfaceDefSeq base_interfaces;
+ IR_InterfaceDefSeq base_interfaces;
-+ if (!(
-+ (_tao_in >> base_interfaces)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--Dynamic::ParameterList *
--POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+ _tao_impl->base_interfaces (
-+ base_interfaces,
-+ ACE_TRY_ENV
-+ );
-
--Dynamic::ExceptionList *
--POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ ACE_CHECK;
-
--CORBA::Any *
--POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
-+ _tao_server_request.init_reply ();
- }
-
--char *
--POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::InterfaceDef::_get_is_abstract_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
-
--CORBA::Boolean
--POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+ CORBA::Boolean _tao_retval = 0;
-
--void
--POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get::result (IR::StructMemberSeq * result)
--{
-- // Update the result.
-- this->_result = result;
--}
-+ _tao_retval = _tao_impl->is_abstract (
-+ ACE_TRY_ENV
-+ );
-
--POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_set::TAO_ServerRequestInfo_IR_ExceptionDef_members_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ExceptionDef *tao_impl
-- ,
-- const IR::StructMemberSeq & members,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- members_ (members)
--{}
-+ ACE_CHECK;
-
--Dynamic::ParameterList *
--POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_members = parameter_list->length ();
-- parameter_list->length (length_members + 1);
-- (*parameter_list)[length_members].argument <<= this->members_;
--
-- (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--Dynamic::ExceptionList *
--POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::InterfaceDef::_set_is_abstract_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
-
--CORBA::Any *
--POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
-+ CORBA::Boolean is_abstract;
-+ if (!(
-+ (_tao_in >> CORBA::Any::to_boolean (is_abstract))
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--char *
--POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ _tao_impl->is_abstract (
-+ is_abstract,
-+ ACE_TRY_ENV
-+ );
+ if (!(
+ (_tao_in >> base_interfaces)
+ ))
+ ACE_THROW (CORBA::MARSHAL());
--CORBA::Boolean
--POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
- }
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -28203,14 +28099,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+ CORBA::Boolean is_abstract;
+ if (!(
+ (_tao_in >> CORBA::Any::to_boolean (is_abstract))
+ ))
+ ACE_THROW (CORBA::MARSHAL());
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_AttributeDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
--{
--private:
-- unsigned int hash (const char *str, unsigned int len);
--public:
-- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
--};
--/* starting time is 16:31:12 */
--/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_AttributeDef_Perfect_Hash_OpTable -N lookup */
--unsigned int
--TAO_IR_AttributeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+void POA_IR::InterfaceDef::_get_is_local_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- static const unsigned char asso_values[] =
-- {
--#if defined (ACE_MVS)
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 0, 0, 10, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 15, 37, 37, 37, 37, 10, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37,
--#else
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-- 0, 0, 10, 37, 37, 37, 37, 37, 37, 0,
-- 0, 37, 37, 37, 37, 37, 15, 37, 37, 37,
-- 37, 10, 37, 37, 37, 37, 37, 37,
--#endif /* ACE_MVS */
-- };
-- return len + asso_values[str[len - 1]] + asso_values[str[0]];
-+ POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
-+
-+ CORBA::Boolean _tao_retval = 0;
-+
-+ _tao_retval = _tao_impl->is_local (
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--const class TAO_operation_db_entry *
--TAO_IR_AttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+void POA_IR::InterfaceDef::_set_is_local_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- enum
-- {
-- TOTAL_KEYWORDS = 20,
-- MIN_WORD_LENGTH = 4,
-- MAX_WORD_LENGTH = 26,
-- MIN_HASH_VALUE = 4,
-- MAX_HASH_VALUE = 36,
-- HASH_VALUE_RANGE = 33,
-- DUPLICATES = 8
-- };
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
-
-- static const class TAO_operation_db_entry wordlist[] =
-- {
-- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::AttributeDef::move_skel},
-- {"_is_a", &POA_IR::AttributeDef::_is_a_skel},
-- {"_get_id", &POA_IR::AttributeDef::_get_id_skel},
-- {"_set_id", &POA_IR::AttributeDef::_set_id_skel},
-- {"describe", &POA_IR::AttributeDef::describe_skel},
-- {"_get_type", &POA_IR::AttributeDef::_get_type_skel},
-- {"_set_name", &POA_IR::AttributeDef::_set_name_skel},
-- {"_get_name", &POA_IR::AttributeDef::_get_name_skel},
-- {"_set_mode", &POA_IR::AttributeDef::_set_mode_skel},
-- {"_get_mode", &POA_IR::AttributeDef::_get_mode_skel},
-- {"_get_version", &POA_IR::AttributeDef::_get_version_skel},
-- {"_set_version", &POA_IR::AttributeDef::_set_version_skel},
-- {"_get_def_kind", &POA_IR::AttributeDef::_get_def_kind_skel},
-- {"_get_defined_in", &POA_IR::AttributeDef::_get_defined_in_skel},
-- {"destroy", &POA_IR::AttributeDef::destroy_skel},
-- {"_get_absolute_name", &POA_IR::AttributeDef::_get_absolute_name_skel},
-- {"_get_type_def", &POA_IR::AttributeDef::_get_type_def_skel},
-- {"_set_type_def", &POA_IR::AttributeDef::_set_type_def_skel},
-- {"_non_existent", &POA_IR::AttributeDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::AttributeDef::_get_containing_repository_skel},
-- };
-+ CORBA::Boolean is_local;
-+ if (!(
-+ (_tao_in >> CORBA::Any::to_boolean (is_local))
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
-- static const signed char lookup[] =
-- {
-- -6, -2, -9, -5, 4, 5, -1, -43, 8, -43, -14, -2, -38, 16,
-- -1, 17, -1, 18, 19, -1, -1, -20, -2, -38, -1, -1, -1, -1,
-- 22, -1, -1, -1, -1, -1, -1, -1, 23,
-- };
-+ _tao_impl->is_local (
-+ is_local,
-+ ACE_TRY_ENV
-+ );
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -28361,14 +28255,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+ CORBA::Boolean is_local;
+ if (!(
+ (_tao_in >> CORBA::Any::to_boolean (is_local))
+ ))
+ ACE_THROW (CORBA::MARSHAL());
-- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-- {
-- unsigned int key = hash (str, len);
-+ ACE_CHECK;
-
-- if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-- {
-- int slot = lookup[key];
-+ _tao_server_request.init_reply ();
-+}
-
-- if (slot >= 0 && slot < MAX_HASH_VALUE)
-- {
-- const char *s = wordlist[slot].opname_;
-+void POA_IR::InterfaceDef::is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
-
-- if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-- return &wordlist[slot];
-- }
-- else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-- return 0;
-- else
-- {
-- unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-- const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-- const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
-+ CORBA::Boolean _tao_retval = 0;
-+ CORBA::String_var interface_id;
-+ if (!(
-+ (_tao_in >> interface_id.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
-- while (--ptr >= base)
-- if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-- return ptr;
-- }
-- }
-- }
-- return 0;
--}
--/* ending time is 16:31:12 */
--static TAO_IR_AttributeDef_Perfect_Hash_OpTable tao_IR_AttributeDef_optable;
-+ _tao_retval = _tao_impl->is_a (
-+ interface_id.in (),
-+ ACE_TRY_ENV
-+ );
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -28447,7 +28339,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
-+ ACE_CHECK;
-
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Implementation
--//
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+}
-
--// Factory function Implementation.
--POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker *POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::the_TAO_AttributeDef_Strategized_Proxy_Broker (void)
-+void POA_IR::InterfaceDef::create_attribute_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- static POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker strategized_proxy_broker;
-- return &strategized_proxy_broker;
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
-+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -28528,14 +28419,14 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
+
+- IR::AttributeDef_var _tao_retval;
+ IR_AttributeDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
+- IR::IDLType_var type;
+- IR::AttributeMode mode;
+- IR::ExceptionDefSeq get_exceptions;
+- IR::ExceptionDefSeq put_exceptions;
+ IR_IDLType_var type;
+ IR_AttributeMode mode;
+ IR_ExceptionDefSeq get_exceptions;
+ IR_ExceptionDefSeq put_exceptions;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> type.out ()) &&
-+ (_tao_in >> mode) &&
-+ (_tao_in >> get_exceptions) &&
-+ (_tao_in >> put_exceptions)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_retval = _tao_impl->create_attribute (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ type.in (),
-+ mode,
-+ get_exceptions,
-+ put_exceptions,
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::_TAO_AttributeDef_Strategized_Proxy_Broker (void)
-+void POA_IR::InterfaceDef::create_operation_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- this->proxy_cache_[i] = 0;
--
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
-+
+ if (!(
+ (_tao_in >> id.out ()) &&
+ (_tao_in >> name.out ()) &&
+@@ -28547,7 +28438,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -28587,7 +28477,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::AttributeDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_AttributeDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -28641,15 +28531,15 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
+
+- IR::OperationDef_var _tao_retval;
+ IR_OperationDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
+- IR::IDLType_var result;
+- IR::OperationMode mode;
+- IR::ParDescriptionSeq params;
+- IR::ExceptionDefSeq exceptions;
+- IR::ContextIdSeq contexts;
+ IR_IDLType_var result;
+ IR_OperationMode mode;
+ IR_ParDescriptionSeq params;
+ IR_ExceptionDefSeq exceptions;
+ IR_ContextIdSeq contexts;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> result.out ()) &&
-+ (_tao_in >> mode) &&
-+ (_tao_in >> params) &&
-+ (_tao_in >> exceptions) &&
-+ (_tao_in >> contexts)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_retval = _tao_impl->create_operation (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ result.in (),
-+ mode,
-+ params,
-+ exceptions,
-+ contexts,
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::~_TAO_AttributeDef_Strategized_Proxy_Broker (void)
-+void POA_IR::InterfaceDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- delete this->proxy_cache_[i];
--
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = 0;
-+ CORBA::String_var value;
+ if (!(
+ (_tao_in >> id.out ()) &&
+ (_tao_in >> name.out ()) &&
+@@ -28662,7 +28552,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -28704,7 +28593,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::OperationDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_OperationDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -28759,7 +28648,7 @@
+ POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *) _tao_object_reference;
+ CORBA::Boolean _tao_retval = 0;
+ CORBA::String_var value;
+- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
-+ ACE_THROW (CORBA::MARSHAL ());
-+
-+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+ ACE_THROW (CORBA::MARSHAL ());
+
+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+@@ -28767,7 +28656,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (CORBA::MARSHAL ());
}
--IR::_TAO_AttributeDef_Proxy_Impl&
--POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::AttributeDef *object,
-+void POA_IR::InterfaceDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-- TAO_ORB_Core::collocation_strategy (object);
--
-- if (this->proxy_cache_[strategy] != 0)
-- return *this->proxy_cache_[strategy];
--
-- this->create_proxy (strategy, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
--
-- return *this->proxy_cache_[strategy];
--
-+ POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+@@ -28784,7 +28673,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (CORBA::MARSHAL ());
}
--void
--POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::create_proxy (
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-+CORBA::Boolean POA_IR::InterfaceDef::_is_a (
-+ const char* value,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
--
-- if (this->proxy_cache_[strategy] == 0)
-- {
-- switch (strategy)
-- {
-- case TAO_ORB_Core::THRU_POA_STRATEGY:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- case TAO_ORB_Core::REMOTE_STRATEGY:
-- default:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- ::IR::_TAO_AttributeDef_Remote_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- }
--
-- }
-+ 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-+ return 1;
-+ else
-+ return 0;
- }
-
-+void* POA_IR::InterfaceDef::_downcast (
-+ const char* logical_type_id
-+ )
-+{
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/InterfaceDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::InterfaceDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Container_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Contained_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-+ return ACE_static_cast (POA_IR::IDLType_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+@@ -28818,7 +28707,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
+ return ACE_static_cast (POA_IR::IDLType_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-+ return ACE_static_cast(PortableServer::Servant, this);
-+ return 0;
-+}
-
--//
--// End Strategized Proxy Broker Implementation
--///////////////////////////////////////////////////////////////////////
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+ return ACE_static_cast(PortableServer::Servant, this);
+ return 0;
+@@ -28848,10 +28737,9 @@
+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
+
+ CORBA::Object_var obj = tmp;
+- return ::IR::InterfaceDef::_unchecked_narrow (obj.in ());
++ return IR_InterfaceDef::_unchecked_narrow (obj.in ());
+ }
+
-
-+void POA_IR::InterfaceDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+{
-+ this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
-+}
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -28931,7 +28819,7 @@
+ POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::InterfaceDef *tao_impl,
+- const IR::InterfaceDefSeq & base_interfaces,
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -29388,10 +29276,10 @@
+ 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 &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -29518,11 +29406,11 @@
+ 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 &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -29651,6 +29539,7 @@
+ }
--IR::_TAO_AttributeDef_Proxy_Broker *
--IR__TAO_AttributeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+const char* POA_IR::InterfaceDef::_interface_repository_id (void) const
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_ValueMemberDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
-- ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::the_TAO_AttributeDef_Strategized_Proxy_Broker();
-+ return "IDL:omg.org/IR/InterfaceDef:1.0";
+ private:
+@@ -29658,7 +29547,7 @@
+ public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 18:47:28 */
++/* starting time is 11:23:10 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ValueMemberDef_Perfect_Hash_OpTable -N lookup */
+ unsigned int
+@@ -29789,10 +29678,9 @@
+ }
+ return 0;
}
+-/* ending time is 18:47:28 */
++/* ending time is 11:23:10 */
+ static TAO_IR_ValueMemberDef_Perfect_Hash_OpTable tao_IR_ValueMemberDef_optable;
--int
--IR__TAO_AttributeDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+IR::InterfaceDef*
-+POA_IR::InterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
-- ACE_UNUSED_ARG (_dummy_);
-+ TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (0);
+-
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Implementation
+ //
+@@ -29818,9 +29706,9 @@
-- IR__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_AttributeDef_Proxy_Broker_Factory_function;
-+ CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
-- return 0;
-+ if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-+ else
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-+
-+ CORBA::Object_var obj = tmp;
-+ return IR_InterfaceDef::_unchecked_narrow (obj.in ());
}
--static int IR__TAO_AttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_AttributeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_AttributeDef_Proxy_Broker_Factory_Initializer));
--
--
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Proxy Implementation
--//
--
--POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_TAO_AttributeDef_ThruPOA_Proxy_Impl (void)
--{}
--
--// ThruPOA Implementation of the IDL interface methods
--
--CORBA::TypeCode_ptr POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type (
-- CORBA_Object *_collocated_tao_target_,
-+class TAO_IR_ValueMemberDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+{
-+private:
-+ unsigned int hash (const char *str, unsigned int len);
-+public:
-+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-+};
-+/* starting time is 11:23:10 */
-+/* C++ code produced by gperf version 2.8 (ACE version) */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ValueMemberDef_Perfect_Hash_OpTable -N lookup */
-+unsigned int
-+TAO_IR_ValueMemberDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+{
-+ static const unsigned char asso_values[] =
-+ {
-+#if defined (ACE_MVS)
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 0, 0, 10, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 0, 15, 37, 37, 37, 37, 10, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37,
-+#else
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-+ 0, 0, 10, 37, 37, 37, 37, 37, 37, 0,
-+ 0, 37, 37, 37, 37, 0, 15, 37, 37, 37,
-+ 37, 10, 37, 37, 37, 37, 37, 37,
-+#endif /* ACE_MVS */
-+ };
-+ return len + asso_values[str[len - 1]] + asso_values[str[0]];
-+}
-+
-+const class TAO_operation_db_entry *
-+TAO_IR_ValueMemberDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+{
-+ enum
-+ {
-+ TOTAL_KEYWORDS = 20,
-+ MIN_WORD_LENGTH = 4,
-+ MAX_WORD_LENGTH = 26,
-+ MIN_HASH_VALUE = 4,
-+ MAX_HASH_VALUE = 36,
-+ HASH_VALUE_RANGE = 33,
-+ DUPLICATES = 7
-+ };
-+
-+ static const class TAO_operation_db_entry wordlist[] =
-+ {
-+ {"",0},{"",0},{"",0},{"",0},
-+ {"move", &POA_IR::ValueMemberDef::move_skel},
-+ {"_is_a", &POA_IR::ValueMemberDef::_is_a_skel},
-+ {"_get_id", &POA_IR::ValueMemberDef::_get_id_skel},
-+ {"_set_id", &POA_IR::ValueMemberDef::_set_id_skel},
-+ {"describe", &POA_IR::ValueMemberDef::describe_skel},
-+ {"_get_type", &POA_IR::ValueMemberDef::_get_type_skel},
-+ {"_set_name", &POA_IR::ValueMemberDef::_set_name_skel},
-+ {"_get_name", &POA_IR::ValueMemberDef::_get_name_skel},
-+ {"_get_access", &POA_IR::ValueMemberDef::_get_access_skel},
-+ {"_set_access", &POA_IR::ValueMemberDef::_set_access_skel},
-+ {"_get_version", &POA_IR::ValueMemberDef::_get_version_skel},
-+ {"_set_version", &POA_IR::ValueMemberDef::_set_version_skel},
-+ {"_get_def_kind", &POA_IR::ValueMemberDef::_get_def_kind_skel},
-+ {"_get_defined_in", &POA_IR::ValueMemberDef::_get_defined_in_skel},
-+ {"destroy", &POA_IR::ValueMemberDef::destroy_skel},
-+ {"_get_absolute_name", &POA_IR::ValueMemberDef::_get_absolute_name_skel},
-+ {"_get_type_def", &POA_IR::ValueMemberDef::_get_type_def_skel},
-+ {"_set_type_def", &POA_IR::ValueMemberDef::_set_type_def_skel},
-+ {"_non_existent", &POA_IR::ValueMemberDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::ValueMemberDef::_get_containing_repository_skel},
-+ };
-+
-+ static const signed char lookup[] =
-+ {
-+ -12, -2, -14, -2, 4, 5, -1, 53, 8, 46, -1, -47, -46, 16,
-+ -1, 17, -1, 18, 19, -9, -3, -20, -2, -38, -6, -2, -1, -1,
-+ 22, -1, -1, -1, -1, -1, -1, -1, 23,
-+ };
-+
-+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-+ {
-+ unsigned int key = hash (str, len);
-+
-+ if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-+ {
-+ int slot = lookup[key];
-+
-+ if (slot >= 0 && slot < MAX_HASH_VALUE)
-+ {
-+ const char *s = wordlist[slot].opname_;
-+
-+ if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-+ return &wordlist[slot];
-+ }
-+ else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-+ return 0;
-+ else
-+ {
-+ unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-+ const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-+ const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
-+
-+ while (--ptr >= base)
-+ if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-+ return ptr;
-+ }
-+ }
-+ }
-+ return 0;
-+}
-+/* ending time is 11:23:10 */
-+static TAO_IR_ValueMemberDef_Perfect_Hash_OpTable tao_IR_ValueMemberDef_optable;
-+
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Implementation
-+//
-+
-+// Factory function Implementation.
-+POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker *POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::the_TAO_ValueMemberDef_Strategized_Proxy_Broker (void)
-+{
-+ static POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ return &strategized_proxy_broker;
-+}
-+
-+POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::_TAO_ValueMemberDef_Strategized_Proxy_Broker (void)
-+{
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ this->proxy_cache_[i] = 0;
-+
-+}
-+
-+POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::~_TAO_ValueMemberDef_Strategized_Proxy_Broker (void)
-+{
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ delete this->proxy_cache_[i];
-+
-+}
-+
+-IR::_TAO_ValueMemberDef_Proxy_Impl&
+_TAO_ValueMemberDef_Proxy_Impl&
-+POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::select_proxy (
+ POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::ValueMemberDef *object,
+ IR_ValueMemberDef *object,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+{
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-+ TAO_ORB_Core::collocation_strategy (object);
-+
-+ if (this->proxy_cache_[strategy] != 0)
-+ return *this->proxy_cache_[strategy];
-+
-+ this->create_proxy (strategy, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-+
-+ return *this->proxy_cache_[strategy];
-+
-+}
-+
-+void
-+POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::create_proxy (
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+{
-+ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-+
-+ if (this->proxy_cache_[strategy] == 0)
-+ {
-+ switch (strategy)
-+ {
-+ case TAO_ORB_Core::THRU_POA_STRATEGY:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -29852,7 +29740,7 @@
+ case TAO_ORB_Core::THRU_POA_STRATEGY:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl,
+ _TAO_ValueMemberDef_ThruPOA_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ case TAO_ORB_Core::REMOTE_STRATEGY:
-+ default:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -29862,7 +29750,7 @@
+ default:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- ::IR::_TAO_ValueMemberDef_Remote_Proxy_Impl,
+ _TAO_ValueMemberDef_Remote_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ }
-+
-+ }
-+}
-+
-+
-+//
-+// End Strategized Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-+
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -29879,26 +29767,26 @@
+ ///////////////////////////////////////////////////////////////////////
+
+
+-IR::_TAO_ValueMemberDef_Proxy_Broker *
+-IR__TAO_ValueMemberDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_ValueMemberDef_Proxy_Broker *
+_TAO_ValueMemberDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+{
-+ ACE_UNUSED_ARG (obj);
-+ return ::POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::the_TAO_ValueMemberDef_Strategized_Proxy_Broker();
-+}
-+
-+int
+ {
+ ACE_UNUSED_ARG (obj);
+ return ::POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::the_TAO_ValueMemberDef_Strategized_Proxy_Broker();
+ }
+
+ int
+-IR__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+{
-+ ACE_UNUSED_ARG (_dummy_);
-+
+ {
+ ACE_UNUSED_ARG (_dummy_);
+
+- IR__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_ValueMemberDef_Proxy_Broker_Factory_function;
+ _TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer =
+ _TAO_ValueMemberDef_Proxy_Broker_Factory_function;
-+
-+ return 0;
-+}
-+
+
+ return 0;
+ }
+
+-static int IR__TAO_ValueMemberDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_ValueMemberDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+ _TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer));
-+
-+
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Proxy Implementation
-+//
-+
-+POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::~_TAO_ValueMemberDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+// ThruPOA Implementation of the IDL interface methods
-+
-+CORBA::TypeCode_ptr POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type (
-+ CORBA_Object *_collocated_tao_target_,
- CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
-@@ -23851,16 +15832,16 @@
- );
- ACE_CHECK_RETURN (0);
- return ACE_reinterpret_cast (
-- POA_IR::AttributeDef_ptr,
-+ POA_IR::ValueMemberDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/AttributeDef:1.0"
-+ "IDL:omg.org/IR/ValueMemberDef:1.0"
- )
- )->type (
- ACE_TRY_ENV
+
+
+ ///////////////////////////////////////////////////////////////////////
+@@ -29941,7 +29829,7 @@
);
}
--IR::IDLType_ptr POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type_def (
-+IR::IDLType_ptr POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
+-IR::IDLType_ptr POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
++IR_IDLType_ptr POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -23868,7 +15849,7 @@
+@@ -29949,7 +29837,7 @@
CORBA::SystemException
))
{
@@ -30894,613 +7130,84 @@
ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -23882,18 +15863,18 @@
- );
- ACE_CHECK_RETURN (0);
- return ACE_reinterpret_cast (
-- POA_IR::AttributeDef_ptr,
-+ POA_IR::ValueMemberDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/AttributeDef:1.0"
-+ "IDL:omg.org/IR/ValueMemberDef:1.0"
- )
- )->type_def (
- ACE_TRY_ENV
- );
- }
+@@ -29974,7 +29862,7 @@
--void POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type_def (
-+void POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
+ void POA_IR::_TAO_ValueMemberDef_ThruPOA_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 ((
-@@ -23912,9 +15893,9 @@
- );
- ACE_CHECK;
- ACE_reinterpret_cast (
-- POA_IR::AttributeDef_ptr,
-+ POA_IR::ValueMemberDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/AttributeDef:1.0"
-+ "IDL:omg.org/IR/ValueMemberDef:1.0"
- )
- )->type_def (
- type_def,
-@@ -23923,7 +15904,7 @@
- return;
- }
-
--IR::AttributeMode POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::mode (
-+CORBA::Visibility POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::access (
- CORBA_Object *_collocated_tao_target_,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -23931,7 +15912,7 @@
- CORBA::SystemException
- ))
- {
-- IR::AttributeMode _tao_retval;
-+ CORBA::Visibility _tao_retval = 0;
- ACE_UNUSED_ARG (_tao_retval);
- TAO_Object_Adapter::Servant_Upcall servant_upcall (
- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -23939,24 +15920,24 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "mode",
-+ "access",
- forward_to.out (),
- ACE_TRY_ENV
- );
- ACE_CHECK_RETURN (_tao_retval);
- return ACE_reinterpret_cast (
-- POA_IR::AttributeDef_ptr,
-+ POA_IR::ValueMemberDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/AttributeDef:1.0"
-+ "IDL:omg.org/IR/ValueMemberDef:1.0"
- )
-- )->mode (
-+ )->access (
- ACE_TRY_ENV
- );
- }
-
--void POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::mode (
-+void POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::access (
- CORBA_Object *_collocated_tao_target_,
-- IR::AttributeMode mode,
-+ CORBA::Visibility access,
- CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
-@@ -23969,18 +15950,18 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "mode",
-+ "access",
- forward_to.out (),
- ACE_TRY_ENV
- );
- ACE_CHECK;
- ACE_reinterpret_cast (
-- POA_IR::AttributeDef_ptr,
-+ POA_IR::ValueMemberDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/AttributeDef:1.0"
-+ "IDL:omg.org/IR/ValueMemberDef:1.0"
- )
-- )->mode (
-- mode,
-+ )->access (
-+ access,
- ACE_TRY_ENV
- );
- return;
-@@ -23991,464 +15972,197 @@
- ///////////////////////////////////////////////////////////////////////
-
- // skeleton constructor
--POA_IR::AttributeDef::AttributeDef (void)
-+POA_IR::ValueMemberDef::ValueMemberDef (void)
- {
-- this->optable_ = &tao_IR_AttributeDef_optable;
-+ this->optable_ = &tao_IR_ValueMemberDef_optable;
- }
-
+@@ -30080,7 +29968,7 @@
// copy ctor
--POA_IR::AttributeDef::AttributeDef (const AttributeDef& rhs)
-+POA_IR::ValueMemberDef::ValueMemberDef (const ValueMemberDef& rhs)
+ POA_IR::ValueMemberDef::ValueMemberDef (const ValueMemberDef& rhs)
: ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+ POA_CORBA_IRObject (rhs),
TAO_ServantBase (rhs)
{}
- // skeleton destructor
--POA_IR::AttributeDef::~AttributeDef (void)
-+POA_IR::ValueMemberDef::~ValueMemberDef (void)
- {
- }
-
--void POA_IR::AttributeDef::_get_type_skel (
-+void POA_IR::ValueMemberDef::_get_type_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *)_tao_object_reference;
-+ POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *)_tao_object_reference;
-
- CORBA::TypeCode_var _tao_retval;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->type (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->type (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
- (_tao_out << _tao_retval.in ())
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void POA_IR::AttributeDef::_get_type_def_skel (
-+void POA_IR::ValueMemberDef::_get_type_def_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
+@@ -30178,7 +30066,7 @@
{
-- POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *)_tao_object_reference;
-+ POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *)_tao_object_reference;
-
-- IR::IDLType_var _tao_retval;
+ POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *)_tao_object_reference;
+
+- IR::IDLType_var _tao_retval;
+ IR_IDLType_var _tao_retval;
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->type_def (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->type_def (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
- (_tao_out << _tao_retval.in ())
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void POA_IR::AttributeDef::_set_type_def_skel (
-+void POA_IR::ValueMemberDef::_set_type_def_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -30205,7 +30093,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -30259,14 +30147,12 @@
TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *)_tao_object_reference;
-+ POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *)_tao_object_reference;
-
--_tao_server_request.argument_flag (0);
+ POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
- IR::IDLType_var type_def;
+ IR_IDLType_var type_def;
if (!(
(_tao_in >> type_def.out ())
))
-- ACE_THROW (CORBA::MARSHAL());
-+ ACE_THROW (CORBA::MARSHAL () );
+ ACE_THROW (CORBA::MARSHAL());
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_impl->type_def (
- type_def.in (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->type_def (
-- type_def.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- }
-
--void POA_IR::AttributeDef::_get_mode_skel (
-+void POA_IR::ValueMemberDef::_get_access_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *)_tao_object_reference;
-+ POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *)_tao_object_reference;
-
-- IR::AttributeMode _tao_retval;
-+ CORBA::Visibility _tao_retval = 0;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->access (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->mode (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::AttributeMode _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
- (_tao_out << _tao_retval)
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void POA_IR::AttributeDef::_set_mode_skel (
-+void POA_IR::ValueMemberDef::_set_access_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -30417,14 +30303,12 @@
TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *)_tao_object_reference;
-+ POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *)_tao_object_reference;
-
--_tao_server_request.argument_flag (0);
-- IR::AttributeMode mode;
-+ CORBA::Visibility access;
+ POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+ CORBA::Visibility access;
if (!(
-- (_tao_in >> mode)
-+ (_tao_in >> access)
+ (_tao_in >> access)
))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
+ ACE_THROW (CORBA::MARSHAL());
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- mode,
-+ _tao_impl->access (
-+ access,
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-
-- _tao_impl->mode (
-- mode,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- }
-
--void POA_IR::AttributeDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::ValueMemberDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *) _tao_object_reference;
-+ POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *) _tao_object_reference;
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -30497,7 +30381,7 @@
+ POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *) _tao_object_reference;
CORBA::Boolean _tao_retval = 0;
CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
ACE_THROW (CORBA::MARSHAL ());
--
-+
+
_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -30505,7 +30389,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -31508,21 +7215,8 @@
ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::AttributeDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::ValueMemberDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *) _tao_object_reference;
-+ POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *) _tao_object_reference;
- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -30522,7 +30406,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -31530,31 +7224,7 @@
ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Boolean POA_IR::AttributeDef::_is_a (
-+CORBA::Boolean POA_IR::ValueMemberDef::_is_a (
- const 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/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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-@@ -24457,33 +16171,33 @@
- return 0;
- }
-
--void* POA_IR::AttributeDef::_downcast (
-+void* POA_IR::ValueMemberDef::_downcast (
- const char* logical_type_id
- )
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/AttributeDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::AttributeDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ValueMemberDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::ValueMemberDef_ptr, this);
+@@ -30550,7 +30434,7 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
return ACE_static_cast (POA_IR::Contained_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
@@ -31563,14907 +7233,628 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
- }
-
--void POA_IR::AttributeDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::ValueMemberDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--const char* POA_IR::AttributeDef::_interface_repository_id (void) const
-+const char* POA_IR::ValueMemberDef::_interface_repository_id (void) const
- {
-- return "IDL:omg.org/IR/AttributeDef:1.0";
-+ return "IDL:omg.org/IR/ValueMemberDef:1.0";
- }
-
--IR::AttributeDef*
--POA_IR::AttributeDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+IR::ValueMemberDef*
-+POA_IR::ValueMemberDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-@@ -24496,12902 +16210,747 @@
+@@ -30580,10 +30464,9 @@
ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
CORBA::Object_var obj = tmp;
-- return ::IR::AttributeDef::_unchecked_narrow (obj.in ());
+- return ::IR::ValueMemberDef::_unchecked_narrow (obj.in ());
+ return IR_ValueMemberDef::_unchecked_narrow (obj.in ());
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::TAO_ServerRequestInfo_IR_AttributeDef_type_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::AttributeDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+class TAO_IR_ValueDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+private:
-+ unsigned int hash (const char *str, unsigned int len);
-+public:
-+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-+};
-+/* starting time is 11:23:11 */
-+/* C++ code produced by gperf version 2.8 (ACE version) */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ValueDef_Perfect_Hash_OpTable -N lookup */
-+unsigned int
-+TAO_IR_ValueDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ static const unsigned char asso_values[] =
-+ {
-+#if defined (ACE_MVS)
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 0,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 0,
-+ 86, 50, 35, 0, 86, 86, 86, 20, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 0, 0, 15,
-+ 86, 0, 86, 0, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 20, 20, 86, 86, 86, 5, 5, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86,
-+#else
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-+ 86, 86, 86, 86, 86, 0, 86, 0, 86, 50,
-+ 35, 0, 86, 86, 86, 20, 86, 86, 0, 0,
-+ 15, 86, 0, 86, 0, 20, 20, 86, 86, 86,
-+ 5, 5, 86, 86, 86, 86, 86, 86,
-+#endif /* ACE_MVS */
-+ };
-+ return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
--CORBA::Any *
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+const class TAO_operation_db_entry *
-+TAO_IR_ValueDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+ enum
-+ {
-+ TOTAL_KEYWORDS = 49,
-+ MIN_WORD_LENGTH = 4,
-+ MAX_WORD_LENGTH = 26,
-+ MIN_HASH_VALUE = 4,
-+ MAX_HASH_VALUE = 85,
-+ HASH_VALUE_RANGE = 82,
-+ DUPLICATES = 16
-+ };
-
--char *
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ static const class TAO_operation_db_entry wordlist[] =
-+ {
-+ {"",0},{"",0},{"",0},{"",0},
-+ {"move", &POA_IR::ValueDef::move_skel},
-+ {"_is_a", &POA_IR::ValueDef::_is_a_skel},
-+ {"lookup", &POA_IR::ValueDef::lookup_skel},
-+ {"_get_name", &POA_IR::ValueDef::_get_name_skel},
-+ {"_get_type", &POA_IR::ValueDef::_get_type_skel},
-+ {"_set_name", &POA_IR::ValueDef::_set_name_skel},
-+ {"lookup_name", &POA_IR::ValueDef::lookup_name_skel},
-+ {"_get_is_custom", &POA_IR::ValueDef::_get_is_custom_skel},
-+ {"_set_is_custom", &POA_IR::ValueDef::_set_is_custom_skel},
-+ {"_get_base_value", &POA_IR::ValueDef::_get_base_value_skel},
-+ {"_set_base_value", &POA_IR::ValueDef::_set_base_value_skel},
-+ {"_get_absolute_name", &POA_IR::ValueDef::_get_absolute_name_skel},
-+ {"_get_is_truncatable", &POA_IR::ValueDef::_get_is_truncatable_skel},
-+ {"_set_is_truncatable", &POA_IR::ValueDef::_set_is_truncatable_skel},
-+ {"is_a", &POA_IR::ValueDef::is_a_skel},
-+ {"_get_version", &POA_IR::ValueDef::_get_version_skel},
-+ {"_set_version", &POA_IR::ValueDef::_set_version_skel},
-+ {"_get_defined_in", &POA_IR::ValueDef::_get_defined_in_skel},
-+ {"_get_containing_repository", &POA_IR::ValueDef::_get_containing_repository_skel},
-+ {"_non_existent", &POA_IR::ValueDef::_non_existent_skel},
-+ {"_get_is_abstract", &POA_IR::ValueDef::_get_is_abstract_skel},
-+ {"_set_is_abstract", &POA_IR::ValueDef::_set_is_abstract_skel},
-+ {"_get_initializers", &POA_IR::ValueDef::_get_initializers_skel},
-+ {"_set_initializers", &POA_IR::ValueDef::_set_initializers_skel},
-+ {"_get_id", &POA_IR::ValueDef::_get_id_skel},
-+ {"_set_id", &POA_IR::ValueDef::_set_id_skel},
-+ {"describe", &POA_IR::ValueDef::describe_skel},
-+ {"_get_supported_interfaces", &POA_IR::ValueDef::_get_supported_interfaces_skel},
-+ {"_set_abstract_base_values", &POA_IR::ValueDef::_set_abstract_base_values_skel},
-+ {"_get_abstract_base_values", &POA_IR::ValueDef::_get_abstract_base_values_skel},
-+ {"_set_supported_interfaces", &POA_IR::ValueDef::_set_supported_interfaces_skel},
-+ {"destroy", &POA_IR::ValueDef::destroy_skel},
-+ {"_get_def_kind", &POA_IR::ValueDef::_get_def_kind_skel},
-+ {"create_enum", &POA_IR::ValueDef::create_enum_skel},
-+ {"create_value", &POA_IR::ValueDef::create_value_skel},
-+ {"create_module", &POA_IR::ValueDef::create_module_skel},
-+ {"create_native", &POA_IR::ValueDef::create_native_skel},
-+ {"create_attribute", &POA_IR::ValueDef::create_attribute_skel},
-+ {"create_interface", &POA_IR::ValueDef::create_interface_skel},
-+ {"create_value_member", &POA_IR::ValueDef::create_value_member_skel},
-+ {"create_value_box", &POA_IR::ValueDef::create_value_box_skel},
-+ {"describe_contents", &POA_IR::ValueDef::describe_contents_skel},
-+ {"create_union", &POA_IR::ValueDef::create_union_skel},
-+ {"contents", &POA_IR::ValueDef::contents_skel},
-+ {"create_operation", &POA_IR::ValueDef::create_operation_skel},
-+ {"create_exception", &POA_IR::ValueDef::create_exception_skel},
-+ {"create_alias", &POA_IR::ValueDef::create_alias_skel},
-+ {"create_struct", &POA_IR::ValueDef::create_struct_skel},
-+ {"create_constant", &POA_IR::ValueDef::create_constant_skel},
-+ };
-
--CORBA::Boolean
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+ static const signed char lookup[] =
-+ {
-+ -1, -1, -7, -3, 4, 5, 6, -11, -2, -92, -1, 10, -13, -2,
-+ -92, -88, -16, -2, 15, -88, -1, -1, -1, -1, 18, -19, -2, -87,
-+ -24, -2, 21, 22, -1, 23, -26, -2, -93, -88, -28, -2, -31, -4,
-+ -89, 30, -1, -90, -1, 35, 36, -1, -1, -1, -1, -1, -1, -1,
-+ -1, -1, -1, -39, -2, 37, 38, -89, -41, -2, -87, -1, -1, 43,
-+ -1, 44, 45, -1, -1, -1, -1, 46, 47, -48, -2, -87, 50, 51,
-+ -1, 52,
-+ };
-
--void
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::result (CORBA::TypeCode_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
-+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-+ {
-+ unsigned int key = hash (str, len);
-
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::AttributeDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
-+ if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-+ {
-+ int slot = lookup[key];
-
--Dynamic::ParameterList *
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+ if (slot >= 0 && slot < MAX_HASH_VALUE)
-+ {
-+ const char *s = wordlist[slot].opname_;
-
--Dynamic::ExceptionList *
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-+ return &wordlist[slot];
-+ }
-+ else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-+ return 0;
-+ else
-+ {
-+ unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-+ const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-+ const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
-
--CORBA::Any *
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
-+ while (--ptr >= base)
-+ if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-+ return ptr;
-+ }
-+ }
-+ }
-+ return 0;
- }
-+/* ending time is 11:23:11 */
-+static TAO_IR_ValueDef_Perfect_Hash_OpTable tao_IR_ValueDef_optable;
-+
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Implementation
-+//
-
--char *
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+// Factory function Implementation.
-+POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker *POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::the_TAO_ValueDef_Strategized_Proxy_Broker (void)
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ static POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ return &strategized_proxy_broker;
- }
-
--CORBA::Boolean
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::_TAO_ValueDef_Strategized_Proxy_Broker (void)
- {
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ this->proxy_cache_[i] = 0;
-+
- }
-
--void
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get::result (IR::IDLType_ptr result)
-+POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::~_TAO_ValueDef_Strategized_Proxy_Broker (void)
- {
-- // Update the result.
-- this->_result = result;
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ delete this->proxy_cache_[i];
-+
- }
-
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::AttributeDef *tao_impl
-- ,
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -30738,7 +30621,7 @@
+ POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::ValueMemberDef *tao_impl,
- IR::IDLType_ptr type_def,
-- CORBA::Environment &
-+_TAO_ValueDef_Proxy_Impl&
-+POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::select_proxy (
-+ IR_ValueDef *object,
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &
)
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- type_def_ (type_def)
--{}
--
--Dynamic::ParameterList *
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -30958,6 +30841,7 @@
+ }
+
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_ValueDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-+ TAO_ORB_Core::collocation_strategy (object);
-
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_type_def = parameter_list->length ();
-- parameter_list->length (length_type_def + 1);
-- (*parameter_list)[length_type_def].argument <<= this->type_def_;
-+ if (this->proxy_cache_[strategy] != 0)
-+ return *this->proxy_cache_[strategy];
-
-- (*parameter_list)[length_type_def].mode = Dynamic::PARAM_IN;
-+ this->create_proxy (strategy, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
-- return safe_parameter_list._retn ();
--}
+ private:
+@@ -30965,7 +30849,7 @@
+ public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 18:47:28 */
++/* starting time is 11:23:11 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ValueDef_Perfect_Hash_OpTable -N lookup */
+ unsigned int
+@@ -31129,10 +31013,9 @@
+ }
+ return 0;
+ }
+-/* ending time is 18:47:28 */
++/* ending time is 11:23:11 */
+ static TAO_IR_ValueDef_Perfect_Hash_OpTable tao_IR_ValueDef_optable;
+
-
--Dynamic::ExceptionList *
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ return *this->proxy_cache_[strategy];
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Implementation
+ //
+@@ -31158,9 +31041,9 @@
-- return exception_list;
}
--CORBA::Any *
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void
-+POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::create_proxy (
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
-- return result_any;
--}
--
--char *
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ if (this->proxy_cache_[strategy] == 0)
-+ {
-+ switch (strategy)
-+ {
-+ case TAO_ORB_Core::THRU_POA_STRATEGY:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+-IR::_TAO_ValueDef_Proxy_Impl&
++_TAO_ValueDef_Proxy_Impl&
+ POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::ValueDef *object,
++ IR_ValueDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -31192,7 +31075,7 @@
+ case TAO_ORB_Core::THRU_POA_STRATEGY:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl,
+ _TAO_ValueDef_ThruPOA_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ case TAO_ORB_Core::REMOTE_STRATEGY:
-+ default:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -31202,7 +31085,7 @@
+ default:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- ::IR::_TAO_ValueDef_Remote_Proxy_Impl,
+ _TAO_ValueDef_Remote_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ }
-+
-+ }
- }
-
--CORBA::Boolean
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -31219,26 +31102,26 @@
+ ///////////////////////////////////////////////////////////////////////
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get::TAO_ServerRequestInfo_IR_AttributeDef_mode_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::AttributeDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
-+//
-+// End Strategized Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-
--Dynamic::ParameterList *
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--Dynamic::ExceptionList *
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
+-IR::_TAO_ValueDef_Proxy_Broker *
+-IR__TAO_ValueDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_ValueDef_Proxy_Broker *
+_TAO_ValueDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ ACE_UNUSED_ARG (obj);
-+ return ::POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::the_TAO_ValueDef_Strategized_Proxy_Broker();
+ ACE_UNUSED_ARG (obj);
+ return ::POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::the_TAO_ValueDef_Strategized_Proxy_Broker();
}
--CORBA::Any *
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+int
+ int
+-IR__TAO_ValueDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_ValueDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
-+ ACE_UNUSED_ARG (_dummy_);
+ ACE_UNUSED_ARG (_dummy_);
-- (*result_any) <<= this->_result;
+- IR__TAO_ValueDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_ValueDef_Proxy_Broker_Factory_function;
+ _TAO_ValueDef_Proxy_Broker_Factory_function_pointer =
+ _TAO_ValueDef_Proxy_Broker_Factory_function;
-- return safe_result_any._retn ();
-+ return 0;
+ return 0;
}
--char *
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
+-static int IR__TAO_ValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_ValueDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ValueDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_ValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+ _TAO_ValueDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ValueDef_Proxy_Broker_Factory_Initializer));
--CORBA::Boolean
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--void
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get::result (IR::AttributeMode result)
--{
-- // Update the result.
-- this->_result = result;
--}
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Proxy Implementation
-+//
-
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_set::TAO_ServerRequestInfo_IR_AttributeDef_mode_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::AttributeDef *tao_impl
-- ,
-- IR::AttributeMode & mode,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- mode_ (mode)
-+POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::_TAO_ValueDef_ThruPOA_Proxy_Impl (void)
- {}
+ ///////////////////////////////////////////////////////////////////////
+@@ -31250,7 +31133,7 @@
--Dynamic::ParameterList *
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_mode = parameter_list->length ();
-- parameter_list->length (length_mode + 1);
-- (*parameter_list)[length_mode].argument <<= this->mode_;
--
-- (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::~_TAO_ValueDef_ThruPOA_Proxy_Impl (void)
-+{}
+ // ThruPOA Implementation of the IDL interface methods
--Dynamic::ExceptionList *
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+// ThruPOA Implementation of the IDL interface methods
-
--CORBA::Any *
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR::InterfaceDefSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
+-IR::InterfaceDefSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
++IR_InterfaceDefSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -31258,7 +31141,7 @@
+ CORBA::SystemException
+ ))
+ {
+- IR::InterfaceDefSeq_var _tao_retval;
+ IR_InterfaceDefSeq_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "supported_interfaces",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ValueDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ValueDef:1.0"
-+ )
-+ )->supported_interfaces (
-+ ACE_TRY_ENV
-+ );
- }
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -31283,7 +31166,7 @@
--char *
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
-+ CORBA_Object *_collocated_tao_target_,
+ void POA_IR::_TAO_ValueDef_ThruPOA_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
-+ ))
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "supported_interfaces",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::ValueDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ValueDef:1.0"
-+ )
-+ )->supported_interfaces (
-+ supported_interfaces,
-+ ACE_TRY_ENV
-+ );
-+ return;
- }
-
--CORBA::Boolean
--POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR::InitializerSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::initializers (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ IR_InitializerSeq_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "initializers",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ValueDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ValueDef:1.0"
-+ )
-+ )->initializers (
-+ ACE_TRY_ENV
-+ );
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -31313,7 +31196,7 @@
+ return;
}
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_OperationDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
--{
--private:
-- unsigned int hash (const char *str, unsigned int len);
--public:
-- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
--};
--/* starting time is 16:31:12 */
--/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_OperationDef_Perfect_Hash_OpTable -N lookup */
--unsigned int
--TAO_IR_OperationDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
--{
-- static const unsigned char asso_values[] =
-- {
--#if defined (ACE_MVS)
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 15, 0, 10, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 0, 5,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 0, 20, 37, 37, 37, 37, 10, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37,
--#else
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-- 15, 0, 10, 37, 37, 37, 37, 37, 37, 0,
-- 5, 37, 37, 37, 37, 0, 20, 37, 37, 37,
-- 37, 10, 37, 37, 37, 37, 37, 37,
--#endif /* ACE_MVS */
-- };
-- return len + asso_values[str[len - 1]] + asso_values[str[0]];
--}
--
--const class TAO_operation_db_entry *
--TAO_IR_OperationDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
--{
-- enum
-- {
-- TOTAL_KEYWORDS = 26,
-- MIN_WORD_LENGTH = 4,
-- MAX_WORD_LENGTH = 26,
-- MIN_HASH_VALUE = 4,
-- MAX_HASH_VALUE = 36,
-- HASH_VALUE_RANGE = 33,
-- DUPLICATES = 10
-- };
--
-- static const class TAO_operation_db_entry wordlist[] =
-- {
-- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::OperationDef::move_skel},
-- {"_is_a", &POA_IR::OperationDef::_is_a_skel},
-- {"_get_mode", &POA_IR::OperationDef::_get_mode_skel},
-- {"_set_name", &POA_IR::OperationDef::_set_name_skel},
-- {"_get_name", &POA_IR::OperationDef::_get_name_skel},
-- {"_set_mode", &POA_IR::OperationDef::_set_mode_skel},
-- {"_get_params", &POA_IR::OperationDef::_get_params_skel},
-- {"_set_params", &POA_IR::OperationDef::_set_params_skel},
-- {"_get_contexts", &POA_IR::OperationDef::_get_contexts_skel},
-- {"_set_contexts", &POA_IR::OperationDef::_set_contexts_skel},
-- {"_get_exceptions", &POA_IR::OperationDef::_get_exceptions_skel},
-- {"_set_exceptions", &POA_IR::OperationDef::_set_exceptions_skel},
-- {"_get_version", &POA_IR::OperationDef::_get_version_skel},
-- {"_set_version", &POA_IR::OperationDef::_set_version_skel},
-- {"_get_absolute_name", &POA_IR::OperationDef::_get_absolute_name_skel},
-- {"_get_defined_in", &POA_IR::OperationDef::_get_defined_in_skel},
-- {"_get_id", &POA_IR::OperationDef::_get_id_skel},
-- {"_set_id", &POA_IR::OperationDef::_set_id_skel},
-- {"describe", &POA_IR::OperationDef::describe_skel},
-- {"_get_result_def", &POA_IR::OperationDef::_get_result_def_skel},
-- {"_set_result_def", &POA_IR::OperationDef::_set_result_def_skel},
-- {"_get_def_kind", &POA_IR::OperationDef::_get_def_kind_skel},
-- {"_get_result", &POA_IR::OperationDef::_get_result_skel},
-- {"destroy", &POA_IR::OperationDef::destroy_skel},
-- {"_non_existent", &POA_IR::OperationDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::OperationDef::_get_containing_repository_skel},
-- };
--
-- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-- {
-- unsigned int key = hash (str, len);
--
-- if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-- {
-- {
-- const class TAO_operation_db_entry *resword;
--
-- switch (key)
-- {
-- case 4:
-- resword = &wordlist[4]; break;
-- case 5:
-- resword = &wordlist[5]; break;
-- case 9:
-- resword = &wordlist[6];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[7];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[8];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[9];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- return 0;
-- case 11:
-- resword = &wordlist[10];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[11];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- return 0;
-- case 13:
-- resword = &wordlist[12];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[13];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- return 0;
-- case 15:
-- resword = &wordlist[14];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[15];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- return 0;
-- case 17:
-- resword = &wordlist[16];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[17];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- return 0;
-- case 18:
-- resword = &wordlist[18]; break;
-- case 20:
-- resword = &wordlist[19]; break;
-- case 22:
-- resword = &wordlist[20];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[21];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- return 0;
-- case 23:
-- resword = &wordlist[22]; break;
-- case 25:
-- resword = &wordlist[23];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[24];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- return 0;
-- case 28:
-- resword = &wordlist[25]; break;
-- case 31:
-- resword = &wordlist[26]; break;
-- case 32:
-- resword = &wordlist[27]; break;
-- case 33:
-- resword = &wordlist[28]; break;
-- case 36:
-- resword = &wordlist[29]; break;
-- default: return 0;
-- }
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1))
-- return resword;
-- return 0;
-- }
-- }
-- }
-- return 0;
--}
--/* ending time is 16:31:12 */
--static TAO_IR_OperationDef_Perfect_Hash_OpTable tao_IR_OperationDef_optable;
--
--
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Implementation
--//
--
--// Factory function Implementation.
--POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker *POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::the_TAO_OperationDef_Strategized_Proxy_Broker (void)
--{
-- static POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker strategized_proxy_broker;
-- return &strategized_proxy_broker;
--}
--
--POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::_TAO_OperationDef_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- this->proxy_cache_[i] = 0;
--
--}
--
--POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::~_TAO_OperationDef_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- delete this->proxy_cache_[i];
--
--}
--
--IR::_TAO_OperationDef_Proxy_Impl&
--POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::OperationDef *object,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-- TAO_ORB_Core::collocation_strategy (object);
--
-- if (this->proxy_cache_[strategy] != 0)
-- return *this->proxy_cache_[strategy];
--
-- this->create_proxy (strategy, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
--
-- return *this->proxy_cache_[strategy];
--
--}
--
--void
--POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::create_proxy (
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
--
-- if (this->proxy_cache_[strategy] == 0)
-- {
-- switch (strategy)
-- {
-- case TAO_ORB_Core::THRU_POA_STRATEGY:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- case TAO_ORB_Core::REMOTE_STRATEGY:
-- default:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- ::IR::_TAO_OperationDef_Remote_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- }
--
-- }
--}
--
--
--//
--// End Strategized Proxy Broker Implementation
--///////////////////////////////////////////////////////////////////////
--
--
--IR::_TAO_OperationDef_Proxy_Broker *
--IR__TAO_OperationDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
--{
-- ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::the_TAO_OperationDef_Strategized_Proxy_Broker();
--}
--
--int
--IR__TAO_OperationDef_Proxy_Broker_Factory_Initializer (long _dummy_)
--{
-- ACE_UNUSED_ARG (_dummy_);
--
-- IR__TAO_OperationDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_OperationDef_Proxy_Broker_Factory_function;
--
-- return 0;
--}
--
--static int IR__TAO_OperationDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_OperationDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_OperationDef_Proxy_Broker_Factory_Initializer));
--
--
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Proxy Implementation
--//
--
--POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::_TAO_OperationDef_ThruPOA_Proxy_Impl (void)
--{}
--
--// ThruPOA Implementation of the IDL interface methods
--
--CORBA::TypeCode_ptr POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::result (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- CORBA::TypeCode_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "result",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::OperationDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/OperationDef:1.0"
-- )
-- )->result (
-- ACE_TRY_ENV
-- );
--}
--
--IR::IDLType_ptr POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::result_def (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- IR::IDLType_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "result_def",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::OperationDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/OperationDef:1.0"
-- )
-- )->result_def (
-- ACE_TRY_ENV
-- );
--}
--
--void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::result_def (
-- CORBA_Object *_collocated_tao_target_,
-- IR::IDLType_ptr result_def,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "result_def",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::OperationDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/OperationDef:1.0"
-- )
-- )->result_def (
-- result_def,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
--IR::ParDescriptionSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::params (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- IR::ParDescriptionSeq_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "params",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::OperationDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/OperationDef:1.0"
-- )
-- )->params (
-- ACE_TRY_ENV
-- );
--}
--
--void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::params (
-- CORBA_Object *_collocated_tao_target_,
-- const IR::ParDescriptionSeq & params,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "params",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::OperationDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/OperationDef:1.0"
-- )
-- )->params (
-- params,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
--IR::OperationMode POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::mode (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- IR::OperationMode _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "mode",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
-- return ACE_reinterpret_cast (
-- POA_IR::OperationDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/OperationDef:1.0"
-- )
-- )->mode (
-- ACE_TRY_ENV
-- );
--}
--
--void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::mode (
-- CORBA_Object *_collocated_tao_target_,
-- IR::OperationMode mode,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "mode",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::OperationDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/OperationDef:1.0"
-- )
-- )->mode (
-- mode,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
--IR::ContextIdSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::contexts (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- IR::ContextIdSeq_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "contexts",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::OperationDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/OperationDef:1.0"
-- )
-- )->contexts (
-- ACE_TRY_ENV
-- );
--}
--
--void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::contexts (
-- CORBA_Object *_collocated_tao_target_,
-- const IR::ContextIdSeq & contexts,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "contexts",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::OperationDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/OperationDef:1.0"
-- )
-- )->contexts (
-- contexts,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
--IR::ExceptionDefSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::exceptions (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- IR::ExceptionDefSeq_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "exceptions",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::OperationDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/OperationDef:1.0"
-- )
-- )->exceptions (
-- ACE_TRY_ENV
-- );
--}
--
--void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::exceptions (
-- CORBA_Object *_collocated_tao_target_,
-- const IR::ExceptionDefSeq & exceptions,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "exceptions",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::OperationDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/OperationDef:1.0"
-- )
-- )->exceptions (
-- exceptions,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
--//
--// End ThruPOA Proxy Implementation
--///////////////////////////////////////////////////////////////////////
--
--// skeleton constructor
--POA_IR::OperationDef::OperationDef (void)
--{
-- this->optable_ = &tao_IR_OperationDef_optable;
--}
--
--// copy ctor
--POA_IR::OperationDef::OperationDef (const OperationDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-- TAO_ServantBase (rhs)
--{}
--
--// skeleton destructor
--POA_IR::OperationDef::~OperationDef (void)
--{
--}
--
--void POA_IR::OperationDef::_get_result_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
--
-- CORBA::TypeCode_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->result (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::OperationDef::_get_result_def_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
--
-- IR::IDLType_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->result_def (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::OperationDef::_set_result_def_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- IR::IDLType_var result_def;
-- if (!(
-- (_tao_in >> result_def.out ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- result_def.in (),
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->result_def (
-- result_def.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::OperationDef::_get_params_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
--
-- IR::ParDescriptionSeq_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->params (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ParDescriptionSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::OperationDef::_set_params_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- IR::ParDescriptionSeq params;
-- if (!(
-- (_tao_in >> params)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- params,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->params (
-- params,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::OperationDef::_get_mode_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
--
-- IR::OperationMode _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->mode (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::OperationMode _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::OperationDef::_set_mode_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- IR::OperationMode mode;
-- if (!(
-- (_tao_in >> mode)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- mode,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->mode (
-- mode,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::OperationDef::_get_contexts_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
--
-- IR::ContextIdSeq_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->contexts (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ContextIdSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::OperationDef::_set_contexts_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- IR::ContextIdSeq contexts;
-- if (!(
-- (_tao_in >> contexts)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- contexts,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->contexts (
-- contexts,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::OperationDef::_get_exceptions_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
--
-- IR::ExceptionDefSeq_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->exceptions (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ExceptionDefSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::OperationDef::_set_exceptions_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- IR::ExceptionDefSeq exceptions;
-- if (!(
-- (_tao_in >> exceptions)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- exceptions,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->exceptions (
-- exceptions,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::OperationDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = 0;
-- CORBA::String_var value;
-- if (!(_tao_in >> value.out ()))
-- ACE_THROW (CORBA::MARSHAL ());
--
-- _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
--}
--
--void POA_IR::OperationDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
--}
--
--CORBA::Boolean POA_IR::OperationDef::_is_a (
-- const 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-- return 1;
-- else
-- return 0;
--}
--
--void* POA_IR::OperationDef::_downcast (
-- const char* logical_type_id
-- )
--{
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/OperationDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::OperationDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-- return ACE_static_cast (POA_IR::Contained_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-- return ACE_static_cast(PortableServer::Servant, this);
-- return 0;
--}
--
--void POA_IR::OperationDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
--{
-- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
--}
--
--const char* POA_IR::OperationDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/OperationDef:1.0";
--}
--
--IR::OperationDef*
--POA_IR::OperationDef::_this (CORBA_Environment &ACE_TRY_ENV)
--{
-- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Object_ptr tmp = CORBA::Object::_nil ();
--
-- if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-- else
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
--
-- CORBA::Object_var obj = tmp;
-- return ::IR::OperationDef::_unchecked_narrow (obj.in ());
--}
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::TAO_ServerRequestInfo_IR_OperationDef_result_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::result (CORBA::TypeCode_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get::TAO_ServerRequestInfo_IR_OperationDef_result_def_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get::result (IR::IDLType_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_set::TAO_ServerRequestInfo_IR_OperationDef_result_def_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
-- IR::IDLType_ptr result_def,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- result_def_ (result_def)
--{}
--
--Dynamic::ParameterList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_result_def = parameter_list->length ();
-- parameter_list->length (length_result_def + 1);
-- (*parameter_list)[length_result_def].argument <<= this->result_def_;
--
-- (*parameter_list)[length_result_def].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get::TAO_ServerRequestInfo_IR_OperationDef_params_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get::result (IR::ParDescriptionSeq * result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_set::TAO_ServerRequestInfo_IR_OperationDef_params_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
-- const IR::ParDescriptionSeq & params,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- params_ (params)
--{}
--
--Dynamic::ParameterList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_params = parameter_list->length ();
-- parameter_list->length (length_params + 1);
-- (*parameter_list)[length_params].argument <<= this->params_;
--
-- (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get::TAO_ServerRequestInfo_IR_OperationDef_mode_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get::result (IR::OperationMode result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_set::TAO_ServerRequestInfo_IR_OperationDef_mode_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
-- IR::OperationMode & mode,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- mode_ (mode)
--{}
--
--Dynamic::ParameterList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_mode = parameter_list->length ();
-- parameter_list->length (length_mode + 1);
-- (*parameter_list)[length_mode].argument <<= this->mode_;
--
-- (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get::TAO_ServerRequestInfo_IR_OperationDef_contexts_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get::result (IR::ContextIdSeq * result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_set::TAO_ServerRequestInfo_IR_OperationDef_contexts_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
-- const IR::ContextIdSeq & contexts,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- contexts_ (contexts)
--{}
--
--Dynamic::ParameterList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_contexts = parameter_list->length ();
-- parameter_list->length (length_contexts + 1);
-- (*parameter_list)[length_contexts].argument <<= this->contexts_;
--
-- (*parameter_list)[length_contexts].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get::result (IR::ExceptionDefSeq * result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
-- const IR::ExceptionDefSeq & exceptions,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- exceptions_ (exceptions)
--{}
--
--Dynamic::ParameterList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_exceptions = parameter_list->length ();
-- parameter_list->length (length_exceptions + 1);
-- (*parameter_list)[length_exceptions].argument <<= this->exceptions_;
--
-- (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_InterfaceDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
--{
--private:
-- unsigned int hash (const char *str, unsigned int len);
--public:
-- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
--};
--/* starting time is 16:31:12 */
--/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_InterfaceDef_Perfect_Hash_OpTable -N lookup */
--unsigned int
--TAO_IR_InterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
--{
-- static const unsigned char asso_values[] =
-- {
--#if defined (ACE_MVS)
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 0,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 0,
-- 66, 20, 8, 0, 66, 66, 66, 10, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 0, 0, 5,
-- 66, 0, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 10, 30, 66, 66, 66, 20, 25, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66,
--#else
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
-- 66, 66, 66, 66, 66, 0, 66, 0, 66, 20,
-- 8, 0, 66, 66, 66, 10, 66, 66, 0, 0,
-- 5, 66, 0, 66, 66, 10, 30, 66, 66, 66,
-- 20, 25, 66, 66, 66, 66, 66, 66,
--#endif /* ACE_MVS */
-- };
-- return len + asso_values[str[len - 1]] + asso_values[str[0]];
--}
--
--const class TAO_operation_db_entry *
--TAO_IR_InterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
--{
-- enum
-- {
-- TOTAL_KEYWORDS = 40,
-- MIN_WORD_LENGTH = 4,
-- MAX_WORD_LENGTH = 26,
-- MIN_HASH_VALUE = 4,
-- MAX_HASH_VALUE = 65,
-- HASH_VALUE_RANGE = 62,
-- DUPLICATES = 11
-- };
--
-- static const class TAO_operation_db_entry wordlist[] =
-- {
-- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::InterfaceDef::move_skel},
-- {"_is_a", &POA_IR::InterfaceDef::_is_a_skel},
-- {"lookup", &POA_IR::InterfaceDef::lookup_skel},
-- {"_get_name", &POA_IR::InterfaceDef::_get_name_skel},
-- {"_get_type", &POA_IR::InterfaceDef::_get_type_skel},
-- {"_set_name", &POA_IR::InterfaceDef::_set_name_skel},
-- {"lookup_name", &POA_IR::InterfaceDef::lookup_name_skel},
-- {"_get_is_local", &POA_IR::InterfaceDef::_get_is_local_skel},
-- {"_set_is_local", &POA_IR::InterfaceDef::_set_is_local_skel},
-- {"is_a", &POA_IR::InterfaceDef::is_a_skel},
-- {"_get_id", &POA_IR::InterfaceDef::_get_id_skel},
-- {"_set_id", &POA_IR::InterfaceDef::_set_id_skel},
-- {"describe", &POA_IR::InterfaceDef::describe_skel},
-- {"_get_version", &POA_IR::InterfaceDef::_get_version_skel},
-- {"_set_version", &POA_IR::InterfaceDef::_set_version_skel},
-- {"_get_absolute_name", &POA_IR::InterfaceDef::_get_absolute_name_skel},
-- {"_get_defined_in", &POA_IR::InterfaceDef::_get_defined_in_skel},
-- {"_get_def_kind", &POA_IR::InterfaceDef::_get_def_kind_skel},
-- {"_get_base_interfaces", &POA_IR::InterfaceDef::_get_base_interfaces_skel},
-- {"_set_base_interfaces", &POA_IR::InterfaceDef::_set_base_interfaces_skel},
-- {"create_enum", &POA_IR::InterfaceDef::create_enum_skel},
-- {"create_value", &POA_IR::InterfaceDef::create_value_skel},
-- {"create_module", &POA_IR::InterfaceDef::create_module_skel},
-- {"create_native", &POA_IR::InterfaceDef::create_native_skel},
-- {"describe_contents", &POA_IR::InterfaceDef::describe_contents_skel},
-- {"create_attribute", &POA_IR::InterfaceDef::create_attribute_skel},
-- {"create_interface", &POA_IR::InterfaceDef::create_interface_skel},
-- {"create_union", &POA_IR::InterfaceDef::create_union_skel},
-- {"contents", &POA_IR::InterfaceDef::contents_skel},
-- {"destroy", &POA_IR::InterfaceDef::destroy_skel},
-- {"create_operation", &POA_IR::InterfaceDef::create_operation_skel},
-- {"create_exception", &POA_IR::InterfaceDef::create_exception_skel},
-- {"create_alias", &POA_IR::InterfaceDef::create_alias_skel},
-- {"_non_existent", &POA_IR::InterfaceDef::_non_existent_skel},
-- {"_get_is_abstract", &POA_IR::InterfaceDef::_get_is_abstract_skel},
-- {"_set_is_abstract", &POA_IR::InterfaceDef::_set_is_abstract_skel},
-- {"_get_containing_repository", &POA_IR::InterfaceDef::_get_containing_repository_skel},
-- {"create_value_box", &POA_IR::InterfaceDef::create_value_box_skel},
-- {"create_struct", &POA_IR::InterfaceDef::create_struct_skel},
-- {"create_constant", &POA_IR::InterfaceDef::create_constant_skel},
-- };
--
-- static const signed char lookup[] =
-- {
-- -11, -2, -14, -2, 4, 5, 6, -17, -2, 103, -1, 10, -1, -78,
-- 13, -78, 16, -75, 19, -1, 20, 21, -22, -2, -26, -2, -29, -2,
-- -34, -2, -73, 24, 25, -74, -1, 28, -75, 31, 32, -1, 33, -78,
-- 36, 37, -38, -2, -67, -7, -3, -1, -1, 40, -1, -1, -1, -1,
-- 41, -1, -1, -1, -1, -1, -1, 42, -1, 43,
-- };
--
-- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-- {
-- unsigned int key = hash (str, len);
--
-- if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-- {
-- int slot = lookup[key];
--
-- if (slot >= 0 && slot < MAX_HASH_VALUE)
-- {
-- const char *s = wordlist[slot].opname_;
--
-- if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-- return &wordlist[slot];
-- }
-- else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-- return 0;
-- else
-- {
-- unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-- const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-- const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
--
-- while (--ptr >= base)
-- if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-- return ptr;
-- }
-- }
-- }
-- return 0;
--}
--/* ending time is 16:31:12 */
--static TAO_IR_InterfaceDef_Perfect_Hash_OpTable tao_IR_InterfaceDef_optable;
--
--
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Implementation
--//
--
--// Factory function Implementation.
--POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker *POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::the_TAO_InterfaceDef_Strategized_Proxy_Broker (void)
--{
-- static POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker strategized_proxy_broker;
-- return &strategized_proxy_broker;
--}
--
--POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::_TAO_InterfaceDef_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- this->proxy_cache_[i] = 0;
--
--}
--
--POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::~_TAO_InterfaceDef_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- delete this->proxy_cache_[i];
--
--}
--
--IR::_TAO_InterfaceDef_Proxy_Impl&
--POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::InterfaceDef *object,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-- TAO_ORB_Core::collocation_strategy (object);
--
-- if (this->proxy_cache_[strategy] != 0)
-- return *this->proxy_cache_[strategy];
--
-- this->create_proxy (strategy, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
--
-- return *this->proxy_cache_[strategy];
--
--}
--
--void
--POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::create_proxy (
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
--
-- if (this->proxy_cache_[strategy] == 0)
-- {
-- switch (strategy)
-- {
-- case TAO_ORB_Core::THRU_POA_STRATEGY:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- case TAO_ORB_Core::REMOTE_STRATEGY:
-- default:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- ::IR::_TAO_InterfaceDef_Remote_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- }
--
-- }
--}
--
--
--//
--// End Strategized Proxy Broker Implementation
--///////////////////////////////////////////////////////////////////////
--
--
--IR::_TAO_InterfaceDef_Proxy_Broker *
--IR__TAO_InterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
--{
-- ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::the_TAO_InterfaceDef_Strategized_Proxy_Broker();
--}
--
--int
--IR__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (long _dummy_)
--{
-- ACE_UNUSED_ARG (_dummy_);
--
-- IR__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_InterfaceDef_Proxy_Broker_Factory_function;
--
-- return 0;
--}
--
--static int IR__TAO_InterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer));
--
--
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Proxy Implementation
--//
--
--POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_TAO_InterfaceDef_ThruPOA_Proxy_Impl (void)
--{}
--
--// ThruPOA Implementation of the IDL interface methods
--
--IR::InterfaceDefSeq * POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- IR::InterfaceDefSeq_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "base_interfaces",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::InterfaceDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/InterfaceDef:1.0"
-- )
-- )->base_interfaces (
-- ACE_TRY_ENV
-- );
--}
--
--void POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
-- CORBA_Object *_collocated_tao_target_,
-- const IR::InterfaceDefSeq & base_interfaces,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "base_interfaces",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::InterfaceDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/InterfaceDef:1.0"
-- )
-- )->base_interfaces (
-- base_interfaces,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
--CORBA::Boolean POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_abstract (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- CORBA::Boolean _tao_retval = 0;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "is_abstract",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
-- return ACE_reinterpret_cast (
-- POA_IR::InterfaceDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/InterfaceDef:1.0"
-- )
-- )->is_abstract (
-- ACE_TRY_ENV
-- );
--}
--
--void POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_abstract (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Boolean is_abstract,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "is_abstract",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::InterfaceDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/InterfaceDef:1.0"
-- )
-- )->is_abstract (
-- is_abstract,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
--CORBA::Boolean POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_local (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- CORBA::Boolean _tao_retval = 0;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "is_local",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
-- return ACE_reinterpret_cast (
-- POA_IR::InterfaceDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/InterfaceDef:1.0"
-- )
-- )->is_local (
-- ACE_TRY_ENV
-- );
--}
--
--void POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_local (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Boolean is_local,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "is_local",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::InterfaceDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/InterfaceDef:1.0"
-- )
-- )->is_local (
-- is_local,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
--CORBA::Boolean POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
-- CORBA_Object *_collocated_tao_target_,
-- const char * interface_id,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- CORBA::Boolean _tao_retval = 0;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "is_a",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
-- return ACE_reinterpret_cast (
-- POA_IR::InterfaceDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/InterfaceDef:1.0"
-- )
-- )->is_a (
-- interface_id,
-- ACE_TRY_ENV
-- );
--}
--
--IR::AttributeDef_ptr POA_IR::_TAO_InterfaceDef_ThruPOA_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,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- IR::AttributeDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_attribute",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::InterfaceDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/InterfaceDef:1.0"
-- )
-- )->create_attribute (
-- id,
-- name,
-- version,
-- type,
-- mode,
-- get_exceptions,
-- put_exceptions,
-- ACE_TRY_ENV
-- );
--}
--
--IR::OperationDef_ptr POA_IR::_TAO_InterfaceDef_ThruPOA_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,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- IR::OperationDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_operation",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::InterfaceDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/InterfaceDef:1.0"
-- )
-- )->create_operation (
-- id,
-- name,
-- version,
-- result,
-- mode,
-- params,
-- exceptions,
-- contexts,
-- ACE_TRY_ENV
-- );
--}
--
--//
--// End ThruPOA Proxy Implementation
--///////////////////////////////////////////////////////////////////////
--
--// skeleton constructor
--POA_IR::InterfaceDef::InterfaceDef (void)
--{
-- this->optable_ = &tao_IR_InterfaceDef_optable;
--}
--
--// copy ctor
--POA_IR::InterfaceDef::InterfaceDef (const InterfaceDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-- ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-- ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
-- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-- TAO_ServantBase (rhs)
--{}
--
--// skeleton destructor
--POA_IR::InterfaceDef::~InterfaceDef (void)
--{
--}
--
--void POA_IR::InterfaceDef::_get_base_interfaces_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
--
-- IR::InterfaceDefSeq_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->base_interfaces (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::InterfaceDef::_set_base_interfaces_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- IR::InterfaceDefSeq base_interfaces;
-- if (!(
-- (_tao_in >> base_interfaces)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- base_interfaces,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->base_interfaces (
-- base_interfaces,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::InterfaceDef::_get_is_abstract_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
--
-- CORBA::Boolean _tao_retval = 0;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->is_abstract (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::Boolean _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::InterfaceDef::_set_is_abstract_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- CORBA::Boolean is_abstract;
-- if (!(
-- (_tao_in >> CORBA::Any::to_boolean (is_abstract))
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- is_abstract,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->is_abstract (
-- is_abstract,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::InterfaceDef::_get_is_local_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
--
-- CORBA::Boolean _tao_retval = 0;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->is_local (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::Boolean _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::InterfaceDef::_set_is_local_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- CORBA::Boolean is_local;
-- if (!(
-- (_tao_in >> CORBA::Any::to_boolean (is_local))
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- is_local,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->is_local (
-- is_local,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::InterfaceDef::is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
--
-- CORBA::Boolean _tao_retval = 0;
-- CORBA::String_var interface_id;
-- if (!(
-- (_tao_in >> interface_id.out ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- interface_id.in (),
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->is_a (
-- interface_id.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::Boolean _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::InterfaceDef::create_attribute_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
--
-- IR::AttributeDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
-- IR::IDLType_var type;
-- IR::AttributeMode mode;
-- IR::ExceptionDefSeq get_exceptions;
-- IR::ExceptionDefSeq put_exceptions;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> type.out ()) &&
-- (_tao_in >> mode) &&
-- (_tao_in >> get_exceptions) &&
-- (_tao_in >> put_exceptions)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- type.in (),
-- mode,
-- get_exceptions,
-- put_exceptions,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_attribute (
-- id.in (),
-- name.in (),
-- version.in (),
-- type.in (),
-- mode,
-- get_exceptions,
-- put_exceptions,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::AttributeDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::InterfaceDef::create_operation_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
--
-- IR::OperationDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
-- IR::IDLType_var result;
-- IR::OperationMode mode;
-- IR::ParDescriptionSeq params;
-- IR::ExceptionDefSeq exceptions;
-- IR::ContextIdSeq contexts;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> result.out ()) &&
-- (_tao_in >> mode) &&
-- (_tao_in >> params) &&
-- (_tao_in >> exceptions) &&
-- (_tao_in >> contexts)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- result.in (),
-- mode,
-- params,
-- exceptions,
-- contexts,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_operation (
-- id.in (),
-- name.in (),
-- version.in (),
-- result.in (),
-- mode,
-- params,
-- exceptions,
-- contexts,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::OperationDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::InterfaceDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = 0;
-- CORBA::String_var value;
-- if (!(_tao_in >> value.out ()))
-- ACE_THROW (CORBA::MARSHAL ());
--
-- _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
--}
--
--void POA_IR::InterfaceDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
--}
--
--CORBA::Boolean POA_IR::InterfaceDef::_is_a (
-- const 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-- return 1;
-- else
-- return 0;
--}
--
--void* POA_IR::InterfaceDef::_downcast (
-- const char* logical_type_id
-- )
--{
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/InterfaceDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::InterfaceDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-- return ACE_static_cast (POA_IR::Container_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-- return ACE_static_cast (POA_IR::Contained_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-- return ACE_static_cast (POA_IR::IDLType_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-- return ACE_static_cast(PortableServer::Servant, this);
-- return 0;
--}
--
--void POA_IR::InterfaceDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
--{
-- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
--}
--
--const char* POA_IR::InterfaceDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/InterfaceDef:1.0";
--}
--
--IR::InterfaceDef*
--POA_IR::InterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV)
--{
-- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Object_ptr tmp = CORBA::Object::_nil ();
--
-- if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-- else
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
--
-- CORBA::Object_var obj = tmp;
-- return ::IR::InterfaceDef::_unchecked_narrow (obj.in ());
--}
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::InterfaceDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get::result (IR::InterfaceDefSeq * result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::InterfaceDef *tao_impl
-- ,
-- const IR::InterfaceDefSeq & base_interfaces,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- base_interfaces_ (base_interfaces)
--{}
--
--Dynamic::ParameterList *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_base_interfaces = parameter_list->length ();
-- parameter_list->length (length_base_interfaces + 1);
-- (*parameter_list)[length_base_interfaces].argument <<= this->base_interfaces_;
--
-- (*parameter_list)[length_base_interfaces].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::InterfaceDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get::result (CORBA::Boolean result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::InterfaceDef *tao_impl
-- ,
-- const CORBA::Boolean & is_abstract,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- is_abstract_ (is_abstract)
--{}
--
--Dynamic::ParameterList *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_is_abstract = parameter_list->length ();
-- parameter_list->length (length_is_abstract + 1);
-- (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
-- (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::InterfaceDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get::result (CORBA::Boolean result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::InterfaceDef *tao_impl
-- ,
-- const CORBA::Boolean & is_local,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- is_local_ (is_local)
--{}
--
--Dynamic::ParameterList *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_is_local = parameter_list->length ();
-- parameter_list->length (length_is_local + 1);
-- (*parameter_list)[length_is_local].argument <<= CORBA::Any::from_boolean (this->is_local_);
-- (*parameter_list)[length_is_local].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a::TAO_ServerRequestInfo_IR_InterfaceDef_is_a (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::InterfaceDef *tao_impl
-- ,
-- const char * interface_id,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- interface_id_ (interface_id)
--{}
--
--Dynamic::ParameterList *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_interface_id = parameter_list->length ();
-- parameter_list->length (length_interface_id + 1);
-- (*parameter_list)[length_interface_id].argument <<= interface_id_;
-- (*parameter_list)[length_interface_id].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a::result (CORBA::Boolean result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::InterfaceDef *tao_impl
-- ,
-- 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_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- type_ (type),
-- mode_ (mode),
-- get_exceptions_ (get_exceptions),
-- put_exceptions_ (put_exceptions)
--{}
--
--Dynamic::ParameterList *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_type = parameter_list->length ();
-- parameter_list->length (length_type + 1);
-- (*parameter_list)[length_type].argument <<= this->type_;
--
-- (*parameter_list)[length_type].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_mode = parameter_list->length ();
-- parameter_list->length (length_mode + 1);
-- (*parameter_list)[length_mode].argument <<= this->mode_;
--
-- (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_get_exceptions = parameter_list->length ();
-- parameter_list->length (length_get_exceptions + 1);
-- (*parameter_list)[length_get_exceptions].argument <<= this->get_exceptions_;
--
-- (*parameter_list)[length_get_exceptions].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_put_exceptions = parameter_list->length ();
-- parameter_list->length (length_put_exceptions + 1);
-- (*parameter_list)[length_put_exceptions].argument <<= this->put_exceptions_;
--
-- (*parameter_list)[length_put_exceptions].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute::result (IR::AttributeDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::InterfaceDef *tao_impl
-- ,
-- 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 &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- result_ (result),
-- mode_ (mode),
-- params_ (params),
-- exceptions_ (exceptions),
-- contexts_ (contexts)
--{}
--
--Dynamic::ParameterList *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_result = parameter_list->length ();
-- parameter_list->length (length_result + 1);
-- (*parameter_list)[length_result].argument <<= this->result_;
--
-- (*parameter_list)[length_result].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_mode = parameter_list->length ();
-- parameter_list->length (length_mode + 1);
-- (*parameter_list)[length_mode].argument <<= this->mode_;
--
-- (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_params = parameter_list->length ();
-- parameter_list->length (length_params + 1);
-- (*parameter_list)[length_params].argument <<= this->params_;
--
-- (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_exceptions = parameter_list->length ();
-- parameter_list->length (length_exceptions + 1);
-- (*parameter_list)[length_exceptions].argument <<= this->exceptions_;
--
-- (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_contexts = parameter_list->length ();
-- parameter_list->length (length_contexts + 1);
-- (*parameter_list)[length_contexts].argument <<= this->contexts_;
--
-- (*parameter_list)[length_contexts].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation::result (IR::OperationDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_ValueMemberDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
--{
--private:
-- unsigned int hash (const char *str, unsigned int len);
--public:
-- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
--};
--/* starting time is 16:31:13 */
--/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ValueMemberDef_Perfect_Hash_OpTable -N lookup */
--unsigned int
--TAO_IR_ValueMemberDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
--{
-- static const unsigned char asso_values[] =
-- {
--#if defined (ACE_MVS)
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 0, 0, 10, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 0, 15, 37, 37, 37, 37, 10, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37,
--#else
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-- 0, 0, 10, 37, 37, 37, 37, 37, 37, 0,
-- 0, 37, 37, 37, 37, 0, 15, 37, 37, 37,
-- 37, 10, 37, 37, 37, 37, 37, 37,
--#endif /* ACE_MVS */
-- };
-- return len + asso_values[str[len - 1]] + asso_values[str[0]];
--}
--
--const class TAO_operation_db_entry *
--TAO_IR_ValueMemberDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
--{
-- enum
-- {
-- TOTAL_KEYWORDS = 20,
-- MIN_WORD_LENGTH = 4,
-- MAX_WORD_LENGTH = 26,
-- MIN_HASH_VALUE = 4,
-- MAX_HASH_VALUE = 36,
-- HASH_VALUE_RANGE = 33,
-- DUPLICATES = 7
-- };
--
-- static const class TAO_operation_db_entry wordlist[] =
-- {
-- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::ValueMemberDef::move_skel},
-- {"_is_a", &POA_IR::ValueMemberDef::_is_a_skel},
-- {"_get_id", &POA_IR::ValueMemberDef::_get_id_skel},
-- {"_set_id", &POA_IR::ValueMemberDef::_set_id_skel},
-- {"describe", &POA_IR::ValueMemberDef::describe_skel},
-- {"_get_type", &POA_IR::ValueMemberDef::_get_type_skel},
-- {"_set_name", &POA_IR::ValueMemberDef::_set_name_skel},
-- {"_get_name", &POA_IR::ValueMemberDef::_get_name_skel},
-- {"_get_access", &POA_IR::ValueMemberDef::_get_access_skel},
-- {"_set_access", &POA_IR::ValueMemberDef::_set_access_skel},
-- {"_get_version", &POA_IR::ValueMemberDef::_get_version_skel},
-- {"_set_version", &POA_IR::ValueMemberDef::_set_version_skel},
-- {"_get_def_kind", &POA_IR::ValueMemberDef::_get_def_kind_skel},
-- {"_get_defined_in", &POA_IR::ValueMemberDef::_get_defined_in_skel},
-- {"destroy", &POA_IR::ValueMemberDef::destroy_skel},
-- {"_get_absolute_name", &POA_IR::ValueMemberDef::_get_absolute_name_skel},
-- {"_get_type_def", &POA_IR::ValueMemberDef::_get_type_def_skel},
-- {"_set_type_def", &POA_IR::ValueMemberDef::_set_type_def_skel},
-- {"_non_existent", &POA_IR::ValueMemberDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::ValueMemberDef::_get_containing_repository_skel},
-- };
--
-- static const signed char lookup[] =
-- {
-- -12, -2, -14, -2, 4, 5, -1, 53, 8, 46, -1, -47, -46, 16,
-- -1, 17, -1, 18, 19, -9, -3, -20, -2, -38, -6, -2, -1, -1,
-- 22, -1, -1, -1, -1, -1, -1, -1, 23,
-- };
--
-- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-- {
-- unsigned int key = hash (str, len);
--
-- if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-- {
-- int slot = lookup[key];
--
-- if (slot >= 0 && slot < MAX_HASH_VALUE)
-- {
-- const char *s = wordlist[slot].opname_;
--
-- if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-- return &wordlist[slot];
-- }
-- else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-- return 0;
-- else
-- {
-- unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-- const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-- const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
--
-- while (--ptr >= base)
-- if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-- return ptr;
-- }
-- }
-- }
-- return 0;
--}
--/* ending time is 16:31:13 */
--static TAO_IR_ValueMemberDef_Perfect_Hash_OpTable tao_IR_ValueMemberDef_optable;
--
--
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Implementation
--//
--
--// Factory function Implementation.
--POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker *POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::the_TAO_ValueMemberDef_Strategized_Proxy_Broker (void)
--{
-- static POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker strategized_proxy_broker;
-- return &strategized_proxy_broker;
--}
--
--POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::_TAO_ValueMemberDef_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- this->proxy_cache_[i] = 0;
--
--}
--
--POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::~_TAO_ValueMemberDef_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- delete this->proxy_cache_[i];
--
--}
--
--IR::_TAO_ValueMemberDef_Proxy_Impl&
--POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::ValueMemberDef *object,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-- TAO_ORB_Core::collocation_strategy (object);
--
-- if (this->proxy_cache_[strategy] != 0)
-- return *this->proxy_cache_[strategy];
--
-- this->create_proxy (strategy, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
--
-- return *this->proxy_cache_[strategy];
--
--}
--
--void
--POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::create_proxy (
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
--
-- if (this->proxy_cache_[strategy] == 0)
-- {
-- switch (strategy)
-- {
-- case TAO_ORB_Core::THRU_POA_STRATEGY:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- case TAO_ORB_Core::REMOTE_STRATEGY:
-- default:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- ::IR::_TAO_ValueMemberDef_Remote_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- }
--
-- }
--}
--
--
--//
--// End Strategized Proxy Broker Implementation
--///////////////////////////////////////////////////////////////////////
--
--
--IR::_TAO_ValueMemberDef_Proxy_Broker *
--IR__TAO_ValueMemberDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
--{
-- ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::the_TAO_ValueMemberDef_Strategized_Proxy_Broker();
--}
--
--int
--IR__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (long _dummy_)
--{
-- ACE_UNUSED_ARG (_dummy_);
--
-- IR__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_ValueMemberDef_Proxy_Broker_Factory_function;
--
-- return 0;
--}
--
--static int IR__TAO_ValueMemberDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer));
--
--
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Proxy Implementation
--//
--
--POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl (void)
--{}
--
--// ThruPOA Implementation of the IDL interface methods
--
--CORBA::TypeCode_ptr POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- CORBA::TypeCode_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "type",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ValueMemberDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueMemberDef:1.0"
-- )
-- )->type (
-- ACE_TRY_ENV
-- );
--}
--
--IR::IDLType_ptr POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- IR::IDLType_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "type_def",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ValueMemberDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueMemberDef:1.0"
-- )
-- )->type_def (
-- ACE_TRY_ENV
-- );
--}
--
--void POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
-- CORBA_Object *_collocated_tao_target_,
-- IR::IDLType_ptr type_def,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "type_def",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::ValueMemberDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueMemberDef:1.0"
-- )
-- )->type_def (
-- type_def,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
--CORBA::Visibility POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::access (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- CORBA::Visibility _tao_retval = 0;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "access",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
-- return ACE_reinterpret_cast (
-- POA_IR::ValueMemberDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueMemberDef:1.0"
-- )
-- )->access (
-- ACE_TRY_ENV
-- );
--}
--
--void POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::access (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Visibility access,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "access",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::ValueMemberDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueMemberDef:1.0"
-- )
-- )->access (
-- access,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
--//
--// End ThruPOA Proxy Implementation
--///////////////////////////////////////////////////////////////////////
--
--// skeleton constructor
--POA_IR::ValueMemberDef::ValueMemberDef (void)
--{
-- this->optable_ = &tao_IR_ValueMemberDef_optable;
--}
--
--// copy ctor
--POA_IR::ValueMemberDef::ValueMemberDef (const ValueMemberDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-- TAO_ServantBase (rhs)
--{}
--
--// skeleton destructor
--POA_IR::ValueMemberDef::~ValueMemberDef (void)
--{
--}
--
--void POA_IR::ValueMemberDef::_get_type_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *)_tao_object_reference;
--
-- CORBA::TypeCode_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->type (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::ValueMemberDef::_get_type_def_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *)_tao_object_reference;
--
-- IR::IDLType_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->type_def (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::ValueMemberDef::_set_type_def_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- IR::IDLType_var type_def;
-- if (!(
-- (_tao_in >> type_def.out ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- type_def.in (),
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->type_def (
-- type_def.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::ValueMemberDef::_get_access_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *)_tao_object_reference;
--
-- CORBA::Visibility _tao_retval = 0;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->access (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::Visibility _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::ValueMemberDef::_set_access_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- CORBA::Visibility access;
-- if (!(
-- (_tao_in >> access)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- access,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->access (
-- access,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::ValueMemberDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = 0;
-- CORBA::String_var value;
-- if (!(_tao_in >> value.out ()))
-- ACE_THROW (CORBA::MARSHAL ());
--
-- _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
--}
--
--void POA_IR::ValueMemberDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
--}
--
--CORBA::Boolean POA_IR::ValueMemberDef::_is_a (
-- const 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-- return 1;
-- else
-- return 0;
--}
--
--void* POA_IR::ValueMemberDef::_downcast (
-- const char* logical_type_id
-- )
--{
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ValueMemberDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::ValueMemberDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-- return ACE_static_cast (POA_IR::Contained_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-- return ACE_static_cast(PortableServer::Servant, this);
-- return 0;
--}
--
--void POA_IR::ValueMemberDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
--{
-- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
--}
--
--const char* POA_IR::ValueMemberDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/ValueMemberDef:1.0";
--}
--
--IR::ValueMemberDef*
--POA_IR::ValueMemberDef::_this (CORBA_Environment &ACE_TRY_ENV)
--{
-- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Object_ptr tmp = CORBA::Object::_nil ();
--
-- if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-- else
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
--
-- CORBA::Object_var obj = tmp;
-- return ::IR::ValueMemberDef::_unchecked_narrow (obj.in ());
--}
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueMemberDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::result (CORBA::TypeCode_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueMemberDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get::result (IR::IDLType_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueMemberDef *tao_impl
-- ,
-- IR::IDLType_ptr type_def,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- type_def_ (type_def)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_type_def = parameter_list->length ();
-- parameter_list->length (length_type_def + 1);
-- (*parameter_list)[length_type_def].argument <<= this->type_def_;
--
-- (*parameter_list)[length_type_def].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueMemberDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get::result (CORBA::Visibility result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_set::TAO_ServerRequestInfo_IR_ValueMemberDef_access_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueMemberDef *tao_impl
-- ,
-- const CORBA::Visibility & access,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- access_ (access)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_access = parameter_list->length ();
-- parameter_list->length (length_access + 1);
-- (*parameter_list)[length_access].argument <<= access_;
-- (*parameter_list)[length_access].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_ValueDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
--{
--private:
-- unsigned int hash (const char *str, unsigned int len);
--public:
-- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
--};
--/* starting time is 16:31:13 */
--/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ValueDef_Perfect_Hash_OpTable -N lookup */
--unsigned int
--TAO_IR_ValueDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
--{
-- static const unsigned char asso_values[] =
-- {
--#if defined (ACE_MVS)
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 0,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 0,
-- 86, 50, 35, 0, 86, 86, 86, 20, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 0, 0, 15,
-- 86, 0, 86, 0, 86, 86, 86, 86, 86, 86,
-- 86, 86, 20, 20, 86, 86, 86, 5, 5, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86,
--#else
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
-- 86, 86, 86, 86, 86, 0, 86, 0, 86, 50,
-- 35, 0, 86, 86, 86, 20, 86, 86, 0, 0,
-- 15, 86, 0, 86, 0, 20, 20, 86, 86, 86,
-- 5, 5, 86, 86, 86, 86, 86, 86,
--#endif /* ACE_MVS */
-- };
-- return len + asso_values[str[len - 1]] + asso_values[str[0]];
--}
--
--const class TAO_operation_db_entry *
--TAO_IR_ValueDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
--{
-- enum
-- {
-- TOTAL_KEYWORDS = 49,
-- MIN_WORD_LENGTH = 4,
-- MAX_WORD_LENGTH = 26,
-- MIN_HASH_VALUE = 4,
-- MAX_HASH_VALUE = 85,
-- HASH_VALUE_RANGE = 82,
-- DUPLICATES = 16
-- };
--
-- static const class TAO_operation_db_entry wordlist[] =
-- {
-- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::ValueDef::move_skel},
-- {"_is_a", &POA_IR::ValueDef::_is_a_skel},
-- {"lookup", &POA_IR::ValueDef::lookup_skel},
-- {"_get_name", &POA_IR::ValueDef::_get_name_skel},
-- {"_get_type", &POA_IR::ValueDef::_get_type_skel},
-- {"_set_name", &POA_IR::ValueDef::_set_name_skel},
-- {"lookup_name", &POA_IR::ValueDef::lookup_name_skel},
-- {"_get_is_custom", &POA_IR::ValueDef::_get_is_custom_skel},
-- {"_set_is_custom", &POA_IR::ValueDef::_set_is_custom_skel},
-- {"_get_base_value", &POA_IR::ValueDef::_get_base_value_skel},
-- {"_set_base_value", &POA_IR::ValueDef::_set_base_value_skel},
-- {"_get_absolute_name", &POA_IR::ValueDef::_get_absolute_name_skel},
-- {"_get_is_truncatable", &POA_IR::ValueDef::_get_is_truncatable_skel},
-- {"_set_is_truncatable", &POA_IR::ValueDef::_set_is_truncatable_skel},
-- {"is_a", &POA_IR::ValueDef::is_a_skel},
-- {"_get_version", &POA_IR::ValueDef::_get_version_skel},
-- {"_set_version", &POA_IR::ValueDef::_set_version_skel},
-- {"_get_defined_in", &POA_IR::ValueDef::_get_defined_in_skel},
-- {"_get_containing_repository", &POA_IR::ValueDef::_get_containing_repository_skel},
-- {"_non_existent", &POA_IR::ValueDef::_non_existent_skel},
-- {"_get_is_abstract", &POA_IR::ValueDef::_get_is_abstract_skel},
-- {"_set_is_abstract", &POA_IR::ValueDef::_set_is_abstract_skel},
-- {"_get_initializers", &POA_IR::ValueDef::_get_initializers_skel},
-- {"_set_initializers", &POA_IR::ValueDef::_set_initializers_skel},
-- {"_get_id", &POA_IR::ValueDef::_get_id_skel},
-- {"_set_id", &POA_IR::ValueDef::_set_id_skel},
-- {"describe", &POA_IR::ValueDef::describe_skel},
-- {"_get_supported_interfaces", &POA_IR::ValueDef::_get_supported_interfaces_skel},
-- {"_set_abstract_base_values", &POA_IR::ValueDef::_set_abstract_base_values_skel},
-- {"_get_abstract_base_values", &POA_IR::ValueDef::_get_abstract_base_values_skel},
-- {"_set_supported_interfaces", &POA_IR::ValueDef::_set_supported_interfaces_skel},
-- {"destroy", &POA_IR::ValueDef::destroy_skel},
-- {"_get_def_kind", &POA_IR::ValueDef::_get_def_kind_skel},
-- {"create_enum", &POA_IR::ValueDef::create_enum_skel},
-- {"create_value", &POA_IR::ValueDef::create_value_skel},
-- {"create_module", &POA_IR::ValueDef::create_module_skel},
-- {"create_native", &POA_IR::ValueDef::create_native_skel},
-- {"create_attribute", &POA_IR::ValueDef::create_attribute_skel},
-- {"create_interface", &POA_IR::ValueDef::create_interface_skel},
-- {"create_value_member", &POA_IR::ValueDef::create_value_member_skel},
-- {"create_value_box", &POA_IR::ValueDef::create_value_box_skel},
-- {"describe_contents", &POA_IR::ValueDef::describe_contents_skel},
-- {"create_union", &POA_IR::ValueDef::create_union_skel},
-- {"contents", &POA_IR::ValueDef::contents_skel},
-- {"create_operation", &POA_IR::ValueDef::create_operation_skel},
-- {"create_exception", &POA_IR::ValueDef::create_exception_skel},
-- {"create_alias", &POA_IR::ValueDef::create_alias_skel},
-- {"create_struct", &POA_IR::ValueDef::create_struct_skel},
-- {"create_constant", &POA_IR::ValueDef::create_constant_skel},
-- };
--
-- static const signed char lookup[] =
-- {
-- -1, -1, -7, -3, 4, 5, 6, -11, -2, -92, -1, 10, -13, -2,
-- -92, -88, -16, -2, 15, -88, -1, -1, -1, -1, 18, -19, -2, -87,
-- -24, -2, 21, 22, -1, 23, -26, -2, -93, -88, -28, -2, -31, -4,
-- -89, 30, -1, -90, -1, 35, 36, -1, -1, -1, -1, -1, -1, -1,
-- -1, -1, -1, -39, -2, 37, 38, -89, -41, -2, -87, -1, -1, 43,
-- -1, 44, 45, -1, -1, -1, -1, 46, 47, -48, -2, -87, 50, 51,
-- -1, 52,
-- };
--
-- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-- {
-- unsigned int key = hash (str, len);
--
-- if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-- {
-- int slot = lookup[key];
--
-- if (slot >= 0 && slot < MAX_HASH_VALUE)
-- {
-- const char *s = wordlist[slot].opname_;
--
-- if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-- return &wordlist[slot];
-- }
-- else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-- return 0;
-- else
-- {
-- unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-- const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-- const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
--
-- while (--ptr >= base)
-- if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-- return ptr;
-- }
-- }
-- }
-- return 0;
--}
--/* ending time is 16:31:13 */
--static TAO_IR_ValueDef_Perfect_Hash_OpTable tao_IR_ValueDef_optable;
--
--
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Implementation
--//
--
--// Factory function Implementation.
--POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker *POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::the_TAO_ValueDef_Strategized_Proxy_Broker (void)
--{
-- static POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker strategized_proxy_broker;
-- return &strategized_proxy_broker;
--}
--
--POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::_TAO_ValueDef_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- this->proxy_cache_[i] = 0;
--
--}
--
--POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::~_TAO_ValueDef_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- delete this->proxy_cache_[i];
--
--}
--
--IR::_TAO_ValueDef_Proxy_Impl&
--POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::ValueDef *object,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-- TAO_ORB_Core::collocation_strategy (object);
--
-- if (this->proxy_cache_[strategy] != 0)
-- return *this->proxy_cache_[strategy];
--
-- this->create_proxy (strategy, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
--
-- return *this->proxy_cache_[strategy];
--
--}
--
--void
--POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::create_proxy (
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
--
-- if (this->proxy_cache_[strategy] == 0)
-- {
-- switch (strategy)
-- {
-- case TAO_ORB_Core::THRU_POA_STRATEGY:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- case TAO_ORB_Core::REMOTE_STRATEGY:
-- default:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- ::IR::_TAO_ValueDef_Remote_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- }
--
-- }
--}
--
--
--//
--// End Strategized Proxy Broker Implementation
--///////////////////////////////////////////////////////////////////////
--
--
--IR::_TAO_ValueDef_Proxy_Broker *
--IR__TAO_ValueDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
--{
-- ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::the_TAO_ValueDef_Strategized_Proxy_Broker();
--}
--
--int
--IR__TAO_ValueDef_Proxy_Broker_Factory_Initializer (long _dummy_)
--{
-- ACE_UNUSED_ARG (_dummy_);
--
-- IR__TAO_ValueDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_ValueDef_Proxy_Broker_Factory_function;
--
-- return 0;
--}
--
--static int IR__TAO_ValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_ValueDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ValueDef_Proxy_Broker_Factory_Initializer));
--
--
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Proxy Implementation
--//
--
--POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::_TAO_ValueDef_ThruPOA_Proxy_Impl (void)
--{}
--
--// ThruPOA Implementation of the IDL interface methods
--
--IR::InterfaceDefSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- IR::InterfaceDefSeq_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "supported_interfaces",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ValueDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueDef:1.0"
-- )
-- )->supported_interfaces (
-- ACE_TRY_ENV
-- );
--}
--
--void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
-- CORBA_Object *_collocated_tao_target_,
-- const IR::InterfaceDefSeq & supported_interfaces,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "supported_interfaces",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::ValueDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueDef:1.0"
-- )
-- )->supported_interfaces (
-- supported_interfaces,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
-IR::InitializerSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::initializers (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
++IR_InitializerSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::initializers (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -31321,7 +31204,7 @@
+ CORBA::SystemException
+ ))
+ {
- IR::InitializerSeq_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "initializers",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ValueDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueDef:1.0"
-- )
-- )->initializers (
-- ACE_TRY_ENV
-- );
--}
--
--void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::initializers (
-- CORBA_Object *_collocated_tao_target_,
-- const IR::InitializerSeq & initializers,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "initializers",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::ValueDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueDef:1.0"
-- )
-- )->initializers (
-- initializers,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
--IR::ValueDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::base_value (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- IR::ValueDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "base_value",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ValueDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueDef:1.0"
-- )
-- )->base_value (
-- ACE_TRY_ENV
-- );
--}
--
--void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::base_value (
-- CORBA_Object *_collocated_tao_target_,
-- IR::ValueDef_ptr base_value,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "base_value",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::ValueDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueDef:1.0"
-- )
-- )->base_value (
-- base_value,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
--IR::ValueDefSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- IR::ValueDefSeq_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "abstract_base_values",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ValueDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueDef:1.0"
-- )
-- )->abstract_base_values (
-- ACE_TRY_ENV
-- );
--}
--
--void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
-- CORBA_Object *_collocated_tao_target_,
-- const IR::ValueDefSeq & abstract_base_values,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "abstract_base_values",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::ValueDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueDef:1.0"
-- )
-- )->abstract_base_values (
-- abstract_base_values,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
--CORBA::Boolean POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- CORBA::Boolean _tao_retval = 0;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "is_abstract",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
-- return ACE_reinterpret_cast (
-- POA_IR::ValueDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueDef:1.0"
-- )
-- )->is_abstract (
-- ACE_TRY_ENV
-- );
--}
--
--void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Boolean is_abstract,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "is_abstract",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::ValueDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueDef:1.0"
-- )
-- )->is_abstract (
-- is_abstract,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
--CORBA::Boolean POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_custom (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- CORBA::Boolean _tao_retval = 0;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "is_custom",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
-- return ACE_reinterpret_cast (
-- POA_IR::ValueDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueDef:1.0"
-- )
-- )->is_custom (
-- ACE_TRY_ENV
-- );
--}
--
--void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_custom (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Boolean is_custom,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "is_custom",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::ValueDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueDef:1.0"
-- )
-- )->is_custom (
-- is_custom,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
--CORBA::Boolean POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- CORBA::Boolean _tao_retval = 0;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "is_truncatable",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
-- return ACE_reinterpret_cast (
-- POA_IR::ValueDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueDef:1.0"
-- )
-- )->is_truncatable (
-- ACE_TRY_ENV
-- );
--}
--
--void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Boolean is_truncatable,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "is_truncatable",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::ValueDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueDef:1.0"
-- )
-- )->is_truncatable (
-- is_truncatable,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
--CORBA::Boolean POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_a (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- CORBA::Boolean _tao_retval = 0;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "is_a",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
-- return ACE_reinterpret_cast (
-- POA_IR::ValueDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueDef:1.0"
-- )
-- )->is_a (
-- id,
-- ACE_TRY_ENV
-- );
--}
--
--IR::ValueMemberDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::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
-- ))
--{
-- IR::ValueMemberDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_value_member",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ValueDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueDef:1.0"
-- )
-- )->create_value_member (
-- id,
-- name,
-- version,
-- type,
-- access,
-- ACE_TRY_ENV
-- );
--}
--
--IR::AttributeDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_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,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- IR::AttributeDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_attribute",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ValueDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueDef:1.0"
-- )
-- )->create_attribute (
-- id,
-- name,
-- version,
-- type,
-- mode,
-- get_exceptions,
-- put_exceptions,
-- ACE_TRY_ENV
-- );
--}
--
--IR::OperationDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_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,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- IR::OperationDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_operation",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ValueDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueDef:1.0"
-- )
-- )->create_operation (
-- id,
-- name,
-- version,
-- result,
-- mode,
-- params,
-- exceptions,
-- contexts,
-- ACE_TRY_ENV
-- );
--}
--
--//
--// End ThruPOA Proxy Implementation
--///////////////////////////////////////////////////////////////////////
--
--// skeleton constructor
--POA_IR::ValueDef::ValueDef (void)
--{
-- this->optable_ = &tao_IR_ValueDef_optable;
--}
--
--// copy ctor
--POA_IR::ValueDef::ValueDef (const ValueDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-- ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-- ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
-- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-- TAO_ServantBase (rhs)
--{}
--
--// skeleton destructor
--POA_IR::ValueDef::~ValueDef (void)
--{
--}
--
--void POA_IR::ValueDef::_get_supported_interfaces_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
--
-- IR::InterfaceDefSeq_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->supported_interfaces (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::ValueDef::_set_supported_interfaces_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- IR::InterfaceDefSeq supported_interfaces;
-- if (!(
-- (_tao_in >> supported_interfaces)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- supported_interfaces,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->supported_interfaces (
-- supported_interfaces,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::ValueDef::_get_initializers_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
--
-- IR::InitializerSeq_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->initializers (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::InitializerSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::ValueDef::_set_initializers_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- IR::InitializerSeq initializers;
-- if (!(
-- (_tao_in >> initializers)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- initializers,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->initializers (
-- initializers,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::ValueDef::_get_base_value_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
--
-- IR::ValueDef_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->base_value (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::ValueDef::_set_base_value_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- IR::ValueDef_var base_value;
-- if (!(
-- (_tao_in >> base_value.out ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- base_value.in (),
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->base_value (
-- base_value.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::ValueDef::_get_abstract_base_values_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
--
-- IR::ValueDefSeq_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->abstract_base_values (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ValueDefSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::ValueDef::_set_abstract_base_values_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- IR::ValueDefSeq abstract_base_values;
-- if (!(
-- (_tao_in >> abstract_base_values)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- abstract_base_values,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->abstract_base_values (
-- abstract_base_values,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::ValueDef::_get_is_abstract_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
--
-- CORBA::Boolean _tao_retval = 0;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->is_abstract (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::Boolean _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::ValueDef::_set_is_abstract_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- CORBA::Boolean is_abstract;
-- if (!(
-- (_tao_in >> CORBA::Any::to_boolean (is_abstract))
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- is_abstract,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->is_abstract (
-- is_abstract,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::ValueDef::_get_is_custom_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
--
-- CORBA::Boolean _tao_retval = 0;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->is_custom (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::Boolean _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::ValueDef::_set_is_custom_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- CORBA::Boolean is_custom;
-- if (!(
-- (_tao_in >> CORBA::Any::to_boolean (is_custom))
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- is_custom,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->is_custom (
-- is_custom,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::ValueDef::_get_is_truncatable_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
--
-- CORBA::Boolean _tao_retval = 0;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->is_truncatable (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::Boolean _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::ValueDef::_set_is_truncatable_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- CORBA::Boolean is_truncatable;
-- if (!(
-- (_tao_in >> CORBA::Any::to_boolean (is_truncatable))
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- is_truncatable,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->is_truncatable (
-- is_truncatable,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::ValueDef::is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
--
-- CORBA::Boolean _tao_retval = 0;
-- CORBA::String_var id;
-- if (!(
-- (_tao_in >> id.out ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->is_a (
-- id.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::Boolean _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::ValueDef::create_value_member_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
--
-- IR::ValueMemberDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
-- IR::IDLType_var type;
-- CORBA::Visibility access;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> type.out ()) &&
-- (_tao_in >> access)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- type.in (),
-- access,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_value_member (
-- id.in (),
-- name.in (),
-- version.in (),
-- type.in (),
-- access,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ValueMemberDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::ValueDef::create_attribute_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
--
-- IR::AttributeDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
-- IR::IDLType_var type;
-- IR::AttributeMode mode;
-- IR::ExceptionDefSeq get_exceptions;
-- IR::ExceptionDefSeq put_exceptions;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> type.out ()) &&
-- (_tao_in >> mode) &&
-- (_tao_in >> get_exceptions) &&
-- (_tao_in >> put_exceptions)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- type.in (),
-- mode,
-- get_exceptions,
-- put_exceptions,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_attribute (
-- id.in (),
-- name.in (),
-- version.in (),
-- type.in (),
-- mode,
-- get_exceptions,
-- put_exceptions,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::AttributeDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::ValueDef::create_operation_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
--
-- IR::OperationDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
-- IR::IDLType_var result;
-- IR::OperationMode mode;
-- IR::ParDescriptionSeq params;
-- IR::ExceptionDefSeq exceptions;
-- IR::ContextIdSeq contexts;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> result.out ()) &&
-- (_tao_in >> mode) &&
-- (_tao_in >> params) &&
-- (_tao_in >> exceptions) &&
-- (_tao_in >> contexts)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- result.in (),
-- mode,
-- params,
-- exceptions,
-- contexts,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_operation (
-- id.in (),
-- name.in (),
-- version.in (),
-- result.in (),
-- mode,
-- params,
-- exceptions,
-- contexts,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::OperationDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::ValueDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = 0;
-- CORBA::String_var value;
-- if (!(_tao_in >> value.out ()))
-- ACE_THROW (CORBA::MARSHAL ());
--
-- _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
--}
--
--void POA_IR::ValueDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
--}
--
--CORBA::Boolean POA_IR::ValueDef::_is_a (
-- const 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-- return 1;
-- else
-- return 0;
--}
--
--void* POA_IR::ValueDef::_downcast (
-- const char* logical_type_id
-- )
--{
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ValueDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::ValueDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-- return ACE_static_cast (POA_IR::Container_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-- return ACE_static_cast (POA_IR::Contained_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-- return ACE_static_cast (POA_IR::IDLType_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-- return ACE_static_cast(PortableServer::Servant, this);
-- return 0;
--}
--
--void POA_IR::ValueDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
--{
-- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
--}
--
--const char* POA_IR::ValueDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/ValueDef:1.0";
--}
--
--IR::ValueDef*
--POA_IR::ValueDef::_this (CORBA_Environment &ACE_TRY_ENV)
--{
-- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Object_ptr tmp = CORBA::Object::_nil ();
--
-- if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-- else
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
--
-- CORBA::Object_var obj = tmp;
-- return ::IR::ValueDef::_unchecked_narrow (obj.in ());
--}
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::result (IR::InterfaceDefSeq * result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- const IR::InterfaceDefSeq & supported_interfaces,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- supported_interfaces_ (supported_interfaces)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_supported_interfaces = parameter_list->length ();
-- parameter_list->length (length_supported_interfaces + 1);
-- (*parameter_list)[length_supported_interfaces].argument <<= this->supported_interfaces_;
--
-- (*parameter_list)[length_supported_interfaces].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get::TAO_ServerRequestInfo_IR_ValueDef_initializers_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get::result (IR::InitializerSeq * result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_set::TAO_ServerRequestInfo_IR_ValueDef_initializers_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
++ IR_InitializerSeq_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -31346,7 +31229,7 @@
+
+ void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::initializers (
+ CORBA_Object *_collocated_tao_target_,
- const IR::InitializerSeq & initializers,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- initializers_ (initializers)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_initializers = parameter_list->length ();
-- parameter_list->length (length_initializers + 1);
-- (*parameter_list)[length_initializers].argument <<= this->initializers_;
--
-- (*parameter_list)[length_initializers].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get::TAO_ServerRequestInfo_IR_ValueDef_base_value_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get::result (IR::ValueDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_set::TAO_ServerRequestInfo_IR_ValueDef_base_value_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- IR::ValueDef_ptr base_value,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- base_value_ (base_value)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_base_value = parameter_list->length ();
-- parameter_list->length (length_base_value + 1);
-- (*parameter_list)[length_base_value].argument <<= this->base_value_;
--
-- (*parameter_list)[length_base_value].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get::result (IR::ValueDefSeq * result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- const IR::ValueDefSeq & abstract_base_values,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- abstract_base_values_ (abstract_base_values)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_abstract_base_values = parameter_list->length ();
-- parameter_list->length (length_abstract_base_values + 1);
-- (*parameter_list)[length_abstract_base_values].argument <<= this->abstract_base_values_;
--
-- (*parameter_list)[length_abstract_base_values].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get::result (CORBA::Boolean result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- const CORBA::Boolean & is_abstract,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- is_abstract_ (is_abstract)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_is_abstract = parameter_list->length ();
-- parameter_list->length (length_is_abstract + 1);
-- (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
-- (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get::result (CORBA::Boolean result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_set::TAO_ServerRequestInfo_IR_ValueDef_is_custom_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- const CORBA::Boolean & is_custom,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- is_custom_ (is_custom)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_is_custom = parameter_list->length ();
-- parameter_list->length (length_is_custom + 1);
-- (*parameter_list)[length_is_custom].argument <<= CORBA::Any::from_boolean (this->is_custom_);
-- (*parameter_list)[length_is_custom].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get::result (CORBA::Boolean result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- const CORBA::Boolean & is_truncatable,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- is_truncatable_ (is_truncatable)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_is_truncatable = parameter_list->length ();
-- parameter_list->length (length_is_truncatable + 1);
-- (*parameter_list)[length_is_truncatable].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
-- (*parameter_list)[length_is_truncatable].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a::TAO_ServerRequestInfo_IR_ValueDef_is_a (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- const char * id,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a::result (CORBA::Boolean result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member::TAO_ServerRequestInfo_IR_ValueDef_create_value_member (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
-- IR::IDLType_ptr type,
-- const CORBA::Visibility & access,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- type_ (type),
-- access_ (access)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_type = parameter_list->length ();
-- parameter_list->length (length_type + 1);
-- (*parameter_list)[length_type].argument <<= this->type_;
--
-- (*parameter_list)[length_type].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_access = parameter_list->length ();
-- parameter_list->length (length_access + 1);
-- (*parameter_list)[length_access].argument <<= access_;
-- (*parameter_list)[length_access].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member::result (IR::ValueMemberDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute::TAO_ServerRequestInfo_IR_ValueDef_create_attribute (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- 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_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- type_ (type),
-- mode_ (mode),
-- get_exceptions_ (get_exceptions),
-- put_exceptions_ (put_exceptions)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_type = parameter_list->length ();
-- parameter_list->length (length_type + 1);
-- (*parameter_list)[length_type].argument <<= this->type_;
--
-- (*parameter_list)[length_type].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_mode = parameter_list->length ();
-- parameter_list->length (length_mode + 1);
-- (*parameter_list)[length_mode].argument <<= this->mode_;
--
-- (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_get_exceptions = parameter_list->length ();
-- parameter_list->length (length_get_exceptions + 1);
-- (*parameter_list)[length_get_exceptions].argument <<= this->get_exceptions_;
--
-- (*parameter_list)[length_get_exceptions].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_put_exceptions = parameter_list->length ();
-- parameter_list->length (length_put_exceptions + 1);
-- (*parameter_list)[length_put_exceptions].argument <<= this->put_exceptions_;
--
-- (*parameter_list)[length_put_exceptions].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute::result (IR::AttributeDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation::TAO_ServerRequestInfo_IR_ValueDef_create_operation (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- 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 &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- result_ (result),
-- mode_ (mode),
-- params_ (params),
-- exceptions_ (exceptions),
-- contexts_ (contexts)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_result = parameter_list->length ();
-- parameter_list->length (length_result + 1);
-- (*parameter_list)[length_result].argument <<= this->result_;
--
-- (*parameter_list)[length_result].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_mode = parameter_list->length ();
-- parameter_list->length (length_mode + 1);
-- (*parameter_list)[length_mode].argument <<= this->mode_;
--
-- (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_params = parameter_list->length ();
-- parameter_list->length (length_params + 1);
-- (*parameter_list)[length_params].argument <<= this->params_;
--
-- (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_exceptions = parameter_list->length ();
-- parameter_list->length (length_exceptions + 1);
-- (*parameter_list)[length_exceptions].argument <<= this->exceptions_;
--
-- (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_contexts = parameter_list->length ();
-- parameter_list->length (length_contexts + 1);
-- (*parameter_list)[length_contexts].argument <<= this->contexts_;
--
-- (*parameter_list)[length_contexts].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation::result (IR::OperationDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_ValueBoxDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
--{
--private:
-- unsigned int hash (const char *str, unsigned int len);
--public:
-- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
--};
--/* starting time is 16:31:13 */
--/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ValueBoxDef_Perfect_Hash_OpTable -N lookup */
--unsigned int
--TAO_IR_ValueBoxDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
--{
-- static const unsigned char asso_values[] =
-- {
--#if defined (ACE_MVS)
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 0, 0, 0, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37,
--#else
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-- 0, 0, 0, 37, 37, 37, 37, 37, 37, 0,
-- 0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
-- 37, 10, 37, 37, 37, 37, 37, 37,
--#endif /* ACE_MVS */
-- };
-- return len + asso_values[str[len - 1]] + asso_values[str[0]];
--}
--
--const class TAO_operation_db_entry *
--TAO_IR_ValueBoxDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
--{
-- enum
-- {
-- TOTAL_KEYWORDS = 18,
-- MIN_WORD_LENGTH = 4,
-- MAX_WORD_LENGTH = 26,
-- MIN_HASH_VALUE = 4,
-- MAX_HASH_VALUE = 36,
-- HASH_VALUE_RANGE = 33,
-- DUPLICATES = 6
-- };
--
-- static const class TAO_operation_db_entry wordlist[] =
-- {
-- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::ValueBoxDef::move_skel},
-- {"_is_a", &POA_IR::ValueBoxDef::_is_a_skel},
-- {"_get_id", &POA_IR::ValueBoxDef::_get_id_skel},
-- {"_set_id", &POA_IR::ValueBoxDef::_set_id_skel},
-- {"describe", &POA_IR::ValueBoxDef::describe_skel},
-- {"_get_name", &POA_IR::ValueBoxDef::_get_name_skel},
-- {"_get_type", &POA_IR::ValueBoxDef::_get_type_skel},
-- {"_set_name", &POA_IR::ValueBoxDef::_set_name_skel},
-- {"_get_version", &POA_IR::ValueBoxDef::_get_version_skel},
-- {"_set_version", &POA_IR::ValueBoxDef::_set_version_skel},
-- {"_get_def_kind", &POA_IR::ValueBoxDef::_get_def_kind_skel},
-- {"_get_defined_in", &POA_IR::ValueBoxDef::_get_defined_in_skel},
-- {"destroy", &POA_IR::ValueBoxDef::destroy_skel},
-- {"_get_absolute_name", &POA_IR::ValueBoxDef::_get_absolute_name_skel},
-- {"_get_original_type_def", &POA_IR::ValueBoxDef::_get_original_type_def_skel},
-- {"_set_original_type_def", &POA_IR::ValueBoxDef::_set_original_type_def_skel},
-- {"_non_existent", &POA_IR::ValueBoxDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::ValueBoxDef::_get_containing_repository_skel},
-- };
--
-- static const signed char lookup[] =
-- {
-- -6, -2, -9, -3, 4, 5, -1, -43, 8, -43, -12, -2, -38, 14,
-- -1, 15, -1, 16, 17, -1, -18, -2, -38, 20, -1, -1, -1, -1,
-- -1, -1, -1, -1, -1, -1, -1, -1, 21,
-- };
--
-- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-- {
-- unsigned int key = hash (str, len);
--
-- if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-- {
-- int slot = lookup[key];
--
-- if (slot >= 0 && slot < MAX_HASH_VALUE)
-- {
-- const char *s = wordlist[slot].opname_;
--
-- if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-- return &wordlist[slot];
-- }
-- else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-- return 0;
-- else
-- {
-- unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-- const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-- const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
--
-- while (--ptr >= base)
-- if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-- return ptr;
-- }
-- }
-- }
-- return 0;
--}
--/* ending time is 16:31:13 */
--static TAO_IR_ValueBoxDef_Perfect_Hash_OpTable tao_IR_ValueBoxDef_optable;
--
--
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Implementation
--//
--
--// Factory function Implementation.
--POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker *POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::the_TAO_ValueBoxDef_Strategized_Proxy_Broker (void)
--{
-- static POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker strategized_proxy_broker;
-- return &strategized_proxy_broker;
--}
--
--POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::_TAO_ValueBoxDef_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- this->proxy_cache_[i] = 0;
--
--}
--
--POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::~_TAO_ValueBoxDef_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- delete this->proxy_cache_[i];
--
--}
--
--IR::_TAO_ValueBoxDef_Proxy_Impl&
--POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::ValueBoxDef *object,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-- TAO_ORB_Core::collocation_strategy (object);
--
-- if (this->proxy_cache_[strategy] != 0)
-- return *this->proxy_cache_[strategy];
--
-- this->create_proxy (strategy, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
--
-- return *this->proxy_cache_[strategy];
--
--}
--
--void
--POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::create_proxy (
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
--
-- if (this->proxy_cache_[strategy] == 0)
-- {
-- switch (strategy)
-- {
-- case TAO_ORB_Core::THRU_POA_STRATEGY:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- POA_IR::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- case TAO_ORB_Core::REMOTE_STRATEGY:
-- default:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- ::IR::_TAO_ValueBoxDef_Remote_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- }
--
-- }
--}
--
--
--//
--// End Strategized Proxy Broker Implementation
--///////////////////////////////////////////////////////////////////////
--
--
--IR::_TAO_ValueBoxDef_Proxy_Broker *
--IR__TAO_ValueBoxDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
--{
-- ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::the_TAO_ValueBoxDef_Strategized_Proxy_Broker();
--}
--
--int
--IR__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (long _dummy_)
--{
-- ACE_UNUSED_ARG (_dummy_);
--
-- IR__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_ValueBoxDef_Proxy_Broker_Factory_function;
--
-- return 0;
--}
--
--static int IR__TAO_ValueBoxDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer));
--
--
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Proxy Implementation
--//
--
--POA_IR::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl (void)
--{}
--
--// ThruPOA Implementation of the IDL interface methods
--
--IR::IDLType_ptr POA_IR::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- IR::IDLType_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "original_type_def",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ValueBoxDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueBoxDef:1.0"
-- )
-- )->original_type_def (
-- ACE_TRY_ENV
-- );
--}
--
--void POA_IR::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
-- CORBA_Object *_collocated_tao_target_,
-- IR::IDLType_ptr original_type_def,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "original_type_def",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::ValueBoxDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ValueBoxDef:1.0"
-- )
-- )->original_type_def (
-- original_type_def,
-- ACE_TRY_ENV
-- );
-- return;
--}
--
--//
--// End ThruPOA Proxy Implementation
--///////////////////////////////////////////////////////////////////////
--
--// skeleton constructor
--POA_IR::ValueBoxDef::ValueBoxDef (void)
--{
-- this->optable_ = &tao_IR_ValueBoxDef_optable;
--}
--
--// copy ctor
--POA_IR::ValueBoxDef::ValueBoxDef (const ValueBoxDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,TypedefDef) (rhs),
-- ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-- ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
-- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-- TAO_ServantBase (rhs)
--{}
--
--// skeleton destructor
--POA_IR::ValueBoxDef::~ValueBoxDef (void)
--{
--}
--
--void POA_IR::ValueBoxDef::_get_original_type_def_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ValueBoxDef *_tao_impl = (POA_IR::ValueBoxDef *)_tao_object_reference;
--
-- IR::IDLType_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->original_type_def (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::ValueBoxDef::_set_original_type_def_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ValueBoxDef *_tao_impl = (POA_IR::ValueBoxDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- IR::IDLType_var original_type_def;
-- if (!(
-- (_tao_in >> original_type_def.out ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- original_type_def.in (),
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->original_type_def (
-- original_type_def.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::ValueBoxDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ValueBoxDef *_tao_impl = (POA_IR::ValueBoxDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = 0;
-- CORBA::String_var value;
-- if (!(_tao_in >> value.out ()))
-- ACE_THROW (CORBA::MARSHAL ());
--
-- _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
--}
--
--void POA_IR::ValueBoxDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ValueBoxDef *_tao_impl = (POA_IR::ValueBoxDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
--}
--
--CORBA::Boolean POA_IR::ValueBoxDef::_is_a (
-- const 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-- return 1;
-- else
-- return 0;
--}
--
--void* POA_IR::ValueBoxDef::_downcast (
-- const char* logical_type_id
-- )
--{
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ValueBoxDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::ValueBoxDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/TypedefDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::TypedefDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-- return ACE_static_cast (POA_IR::Contained_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-- return ACE_static_cast (POA_IR::IDLType_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-- return ACE_static_cast(PortableServer::Servant, this);
-- return 0;
--}
--
--void POA_IR::ValueBoxDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
--{
-- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
--}
--
--const char* POA_IR::ValueBoxDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/ValueBoxDef:1.0";
--}
--
--IR::ValueBoxDef*
--POA_IR::ValueBoxDef::_this (CORBA_Environment &ACE_TRY_ENV)
--{
-- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Object_ptr tmp = CORBA::Object::_nil ();
--
-- if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-- else
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
--
-- CORBA::Object_var obj = tmp;
-- return ::IR::ValueBoxDef::_unchecked_narrow (obj.in ());
--}
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueBoxDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get::result (IR::IDLType_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueBoxDef *tao_impl
-- ,
-- IR::IDLType_ptr original_type_def,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- original_type_def_ (original_type_def)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_original_type_def = parameter_list->length ();
-- parameter_list->length (length_original_type_def + 1);
-- (*parameter_list)[length_original_type_def].argument <<= this->original_type_def_;
--
-- (*parameter_list)[length_original_type_def].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_ProvidesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
--{
--private:
-- unsigned int hash (const char *str, unsigned int len);
--public:
-- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
--};
--/* starting time is 16:31:13 */
--/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ProvidesDef_Perfect_Hash_OpTable -N lookup */
--unsigned int
--TAO_IR_ProvidesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
--{
-- static const unsigned char asso_values[] =
-- {
--#if defined (ACE_MVS)
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 0, 0, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37,
--#else
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-- 0, 0, 37, 37, 37, 37, 37, 37, 37, 0,
-- 0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
-- 37, 10, 37, 37, 37, 37, 37, 37,
--#endif /* ACE_MVS */
-- };
-- return len + asso_values[str[len - 1]] + asso_values[str[0]];
--}
--
--const class TAO_operation_db_entry *
--TAO_IR_ProvidesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
--{
-- enum
-- {
-- TOTAL_KEYWORDS = 16,
-- MIN_WORD_LENGTH = 4,
-- MAX_WORD_LENGTH = 26,
-- MIN_HASH_VALUE = 4,
-- MAX_HASH_VALUE = 36,
-- HASH_VALUE_RANGE = 33,
-- DUPLICATES = 4
-- };
--
-- static const class TAO_operation_db_entry wordlist[] =
-- {
-- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::ProvidesDef::move_skel},
-- {"_is_a", &POA_IR::ProvidesDef::_is_a_skel},
-- {"_get_id", &POA_IR::ProvidesDef::_get_id_skel},
-- {"_set_id", &POA_IR::ProvidesDef::_set_id_skel},
-- {"describe", &POA_IR::ProvidesDef::describe_skel},
-- {"_get_name", &POA_IR::ProvidesDef::_get_name_skel},
-- {"_set_name", &POA_IR::ProvidesDef::_set_name_skel},
-- {"_get_version", &POA_IR::ProvidesDef::_get_version_skel},
-- {"_set_version", &POA_IR::ProvidesDef::_set_version_skel},
-- {"_get_def_kind", &POA_IR::ProvidesDef::_get_def_kind_skel},
-- {"_get_defined_in", &POA_IR::ProvidesDef::_get_defined_in_skel},
-- {"destroy", &POA_IR::ProvidesDef::destroy_skel},
-- {"_get_absolute_name", &POA_IR::ProvidesDef::_get_absolute_name_skel},
-- {"_get_interface_type", &POA_IR::ProvidesDef::_get_interface_type_skel},
-- {"_non_existent", &POA_IR::ProvidesDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::ProvidesDef::_get_containing_repository_skel},
-- };
--
-- static const signed char lookup[] =
-- {
-- -6, -2, -9, -2, 4, 5, -1, -43, 8, -43, -11, -2, -38, 13,
-- -1, 14, -1, 15, 16, 17, -1, -1, -1, 18, -1, -1, -1, -1,
-- -1, -1, -1, -1, -1, -1, -1, -1, 19,
-- };
--
-- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-- {
-- unsigned int key = hash (str, len);
--
-- if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-- {
-- int slot = lookup[key];
--
-- if (slot >= 0 && slot < MAX_HASH_VALUE)
-- {
-- const char *s = wordlist[slot].opname_;
--
-- if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-- return &wordlist[slot];
-- }
-- else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-- return 0;
-- else
-- {
-- unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-- const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-- const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
--
-- while (--ptr >= base)
-- if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-- return ptr;
-- }
-- }
-- }
-- return 0;
--}
--/* ending time is 16:31:13 */
--static TAO_IR_ProvidesDef_Perfect_Hash_OpTable tao_IR_ProvidesDef_optable;
--
--
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Implementation
--//
--
--// Factory function Implementation.
--POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker *POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::the_TAO_ProvidesDef_Strategized_Proxy_Broker (void)
--{
-- static POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker strategized_proxy_broker;
-- return &strategized_proxy_broker;
--}
--
--POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::_TAO_ProvidesDef_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- this->proxy_cache_[i] = 0;
--
--}
--
--POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::~_TAO_ProvidesDef_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- delete this->proxy_cache_[i];
--
--}
--
--IR::_TAO_ProvidesDef_Proxy_Impl&
--POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::ProvidesDef *object,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-- TAO_ORB_Core::collocation_strategy (object);
--
-- if (this->proxy_cache_[strategy] != 0)
-- return *this->proxy_cache_[strategy];
--
-- this->create_proxy (strategy, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
--
-- return *this->proxy_cache_[strategy];
--
--}
--
--void
--POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::create_proxy (
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
--
-- if (this->proxy_cache_[strategy] == 0)
-- {
-- switch (strategy)
-- {
-- case TAO_ORB_Core::THRU_POA_STRATEGY:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- case TAO_ORB_Core::REMOTE_STRATEGY:
-- default:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- ::IR::_TAO_ProvidesDef_Remote_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- }
--
-- }
--}
--
--
--//
--// End Strategized Proxy Broker Implementation
--///////////////////////////////////////////////////////////////////////
--
--
--IR::_TAO_ProvidesDef_Proxy_Broker *
--IR__TAO_ProvidesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
--{
-- ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::the_TAO_ProvidesDef_Strategized_Proxy_Broker();
--}
--
--int
--IR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (long _dummy_)
--{
-- ACE_UNUSED_ARG (_dummy_);
--
-- IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_ProvidesDef_Proxy_Broker_Factory_function;
--
-- return 0;
--}
--
--static int IR__TAO_ProvidesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer));
--
--
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Proxy Implementation
--//
--
--POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_TAO_ProvidesDef_ThruPOA_Proxy_Impl (void)
--{}
--
--// ThruPOA Implementation of the IDL interface methods
--
--IR::InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_type (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- IR::InterfaceDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "interface_type",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ProvidesDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ProvidesDef:1.0"
-- )
-- )->interface_type (
-- ACE_TRY_ENV
-- );
--}
--
--//
--// End ThruPOA Proxy Implementation
--///////////////////////////////////////////////////////////////////////
--
--// skeleton constructor
--POA_IR::ProvidesDef::ProvidesDef (void)
--{
-- this->optable_ = &tao_IR_ProvidesDef_optable;
--}
--
--// copy ctor
--POA_IR::ProvidesDef::ProvidesDef (const ProvidesDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-- TAO_ServantBase (rhs)
--{}
--
--// skeleton destructor
--POA_IR::ProvidesDef::~ProvidesDef (void)
--{
--}
--
--void POA_IR::ProvidesDef::_get_interface_type_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *)_tao_object_reference;
--
-- IR::InterfaceDef_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->interface_type (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::ProvidesDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = 0;
-- CORBA::String_var value;
-- if (!(_tao_in >> value.out ()))
-- ACE_THROW (CORBA::MARSHAL ());
--
-- _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
--}
--
--void POA_IR::ProvidesDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
--}
--
--CORBA::Boolean POA_IR::ProvidesDef::_is_a (
-- const 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-- return 1;
-- else
-- return 0;
--}
--
--void* POA_IR::ProvidesDef::_downcast (
-- const char* logical_type_id
-- )
--{
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ProvidesDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::ProvidesDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-- return ACE_static_cast (POA_IR::Contained_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-- return ACE_static_cast(PortableServer::Servant, this);
-- return 0;
--}
--
--void POA_IR::ProvidesDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
--{
-- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
--}
--
--const char* POA_IR::ProvidesDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/ProvidesDef:1.0";
--}
--
--IR::ProvidesDef*
--POA_IR::ProvidesDef::_this (CORBA_Environment &ACE_TRY_ENV)
--{
-- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Object_ptr tmp = CORBA::Object::_nil ();
--
-- if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-- else
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
--
-- CORBA::Object_var obj = tmp;
-- return ::IR::ProvidesDef::_unchecked_narrow (obj.in ());
--}
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ProvidesDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (IR::InterfaceDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_UsesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
--{
--private:
-- unsigned int hash (const char *str, unsigned int len);
--public:
-- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
--};
--/* starting time is 16:31:13 */
--/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_UsesDef_Perfect_Hash_OpTable -N lookup */
--unsigned int
--TAO_IR_UsesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
--{
-- static const unsigned char asso_values[] =
-- {
--#if defined (ACE_MVS)
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 0, 0, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37,
--#else
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-- 0, 0, 37, 37, 37, 37, 37, 37, 37, 0,
-- 0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
-- 37, 10, 37, 37, 37, 37, 37, 37,
--#endif /* ACE_MVS */
-- };
-- return len + asso_values[str[len - 1]] + asso_values[str[0]];
--}
--
--const class TAO_operation_db_entry *
--TAO_IR_UsesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
--{
-- enum
-- {
-- TOTAL_KEYWORDS = 17,
-- MIN_WORD_LENGTH = 4,
-- MAX_WORD_LENGTH = 26,
-- MIN_HASH_VALUE = 4,
-- MAX_HASH_VALUE = 36,
-- HASH_VALUE_RANGE = 33,
-- DUPLICATES = 4
-- };
--
-- static const class TAO_operation_db_entry wordlist[] =
-- {
-- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::UsesDef::move_skel},
-- {"_is_a", &POA_IR::UsesDef::_is_a_skel},
-- {"_get_id", &POA_IR::UsesDef::_get_id_skel},
-- {"_set_id", &POA_IR::UsesDef::_set_id_skel},
-- {"describe", &POA_IR::UsesDef::describe_skel},
-- {"_get_name", &POA_IR::UsesDef::_get_name_skel},
-- {"_set_name", &POA_IR::UsesDef::_set_name_skel},
-- {"_get_version", &POA_IR::UsesDef::_get_version_skel},
-- {"_set_version", &POA_IR::UsesDef::_set_version_skel},
-- {"_get_def_kind", &POA_IR::UsesDef::_get_def_kind_skel},
-- {"_get_defined_in", &POA_IR::UsesDef::_get_defined_in_skel},
-- {"_get_is_multiple", &POA_IR::UsesDef::_get_is_multiple_skel},
-- {"destroy", &POA_IR::UsesDef::destroy_skel},
-- {"_get_absolute_name", &POA_IR::UsesDef::_get_absolute_name_skel},
-- {"_get_interface_type", &POA_IR::UsesDef::_get_interface_type_skel},
-- {"_non_existent", &POA_IR::UsesDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::UsesDef::_get_containing_repository_skel},
-- };
--
-- static const signed char lookup[] =
-- {
-- -6, -2, -9, -2, 4, 5, -1, -43, 8, -43, -11, -2, -38, 13,
-- -1, 14, 15, 16, 17, 18, -1, -1, -1, 19, -1, -1, -1, -1,
-- -1, -1, -1, -1, -1, -1, -1, -1, 20,
-- };
--
-- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-- {
-- unsigned int key = hash (str, len);
--
-- if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-- {
-- int slot = lookup[key];
--
-- if (slot >= 0 && slot < MAX_HASH_VALUE)
-- {
-- const char *s = wordlist[slot].opname_;
--
-- if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-- return &wordlist[slot];
-- }
-- else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-- return 0;
-- else
-- {
-- unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-- const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-- const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
--
-- while (--ptr >= base)
-- if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-- return ptr;
-- }
-- }
-- }
-- return 0;
--}
--/* ending time is 16:31:13 */
--static TAO_IR_UsesDef_Perfect_Hash_OpTable tao_IR_UsesDef_optable;
--
--
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Implementation
--//
--
--// Factory function Implementation.
--POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker *POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::the_TAO_UsesDef_Strategized_Proxy_Broker (void)
--{
-- static POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker strategized_proxy_broker;
-- return &strategized_proxy_broker;
--}
--
--POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::_TAO_UsesDef_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- this->proxy_cache_[i] = 0;
--
--}
--
--POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::~_TAO_UsesDef_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- delete this->proxy_cache_[i];
--
--}
--
--IR::_TAO_UsesDef_Proxy_Impl&
--POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::UsesDef *object,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-- TAO_ORB_Core::collocation_strategy (object);
--
-- if (this->proxy_cache_[strategy] != 0)
-- return *this->proxy_cache_[strategy];
--
-- this->create_proxy (strategy, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
--
-- return *this->proxy_cache_[strategy];
--
--}
--
--void
--POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::create_proxy (
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
--
-- if (this->proxy_cache_[strategy] == 0)
-- {
-- switch (strategy)
-- {
-- case TAO_ORB_Core::THRU_POA_STRATEGY:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- case TAO_ORB_Core::REMOTE_STRATEGY:
-- default:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- ::IR::_TAO_UsesDef_Remote_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- }
--
-- }
--}
--
--
--//
--// End Strategized Proxy Broker Implementation
--///////////////////////////////////////////////////////////////////////
--
--
--IR::_TAO_UsesDef_Proxy_Broker *
--IR__TAO_UsesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
--{
-- ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::the_TAO_UsesDef_Strategized_Proxy_Broker();
--}
--
--int
--IR__TAO_UsesDef_Proxy_Broker_Factory_Initializer (long _dummy_)
--{
-- ACE_UNUSED_ARG (_dummy_);
--
-- IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_UsesDef_Proxy_Broker_Factory_function;
--
-- return 0;
--}
--
--static int IR__TAO_UsesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_UsesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_UsesDef_Proxy_Broker_Factory_Initializer));
--
--
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Proxy Implementation
--//
--
--POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_TAO_UsesDef_ThruPOA_Proxy_Impl (void)
--{}
--
--// ThruPOA Implementation of the IDL interface methods
--
--IR::InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- IR::InterfaceDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "interface_type",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::UsesDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/UsesDef:1.0"
-- )
-- )->interface_type (
-- ACE_TRY_ENV
-- );
--}
--
--CORBA::Boolean POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::is_multiple (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-- CORBA::Boolean _tao_retval = 0;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "is_multiple",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
-- return ACE_reinterpret_cast (
-- POA_IR::UsesDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/UsesDef:1.0"
-- )
-- )->is_multiple (
-- ACE_TRY_ENV
-- );
--}
--
--//
--// End ThruPOA Proxy Implementation
--///////////////////////////////////////////////////////////////////////
--
--// skeleton constructor
--POA_IR::UsesDef::UsesDef (void)
--{
-- this->optable_ = &tao_IR_UsesDef_optable;
--}
--
--// copy ctor
--POA_IR::UsesDef::UsesDef (const UsesDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-- TAO_ServantBase (rhs)
--{}
--
--// skeleton destructor
--POA_IR::UsesDef::~UsesDef (void)
--{
--}
--
--void POA_IR::UsesDef::_get_interface_type_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *)_tao_object_reference;
--
-- IR::InterfaceDef_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->interface_type (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::UsesDef::_get_is_multiple_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *)_tao_object_reference;
--
-- CORBA::Boolean _tao_retval = 0;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->is_multiple (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::Boolean _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::UsesDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = 0;
-- CORBA::String_var value;
-- if (!(_tao_in >> value.out ()))
-- ACE_THROW (CORBA::MARSHAL ());
--
-- _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
--}
--
--void POA_IR::UsesDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
--}
--
--CORBA::Boolean POA_IR::UsesDef::_is_a (
-- const 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-- return 1;
-- else
-- return 0;
--}
--
--void* POA_IR::UsesDef::_downcast (
-- const char* logical_type_id
-- )
--{
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/UsesDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::UsesDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-- return ACE_static_cast (POA_IR::Contained_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-- return ACE_static_cast(PortableServer::Servant, this);
-- return 0;
--}
--
--void POA_IR::UsesDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
--{
-- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
--}
--
--const char* POA_IR::UsesDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/UsesDef:1.0";
--}
--
--IR::UsesDef*
--POA_IR::UsesDef::_this (CORBA_Environment &ACE_TRY_ENV)
--{
-- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Object_ptr tmp = CORBA::Object::_nil ();
--
-- if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-- else
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
--
-- CORBA::Object_var obj = tmp;
-- return ::IR::UsesDef::_unchecked_narrow (obj.in ());
--}
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::UsesDef *tao_impl
-- ,
-- CORBA::Environment &
-+void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::initializers (
-+ CORBA_Object *_collocated_tao_target_,
+ const IR_InitializerSeq & initializers,
-+ CORBA::Environment &ACE_TRY_ENV
- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (IR::InterfaceDef_ptr result)
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Update the result.
-- this->_result = result;
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "initializers",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::ValueDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ValueDef:1.0"
-+ )
-+ )->initializers (
-+ initializers,
-+ ACE_TRY_ENV
-+ );
-+ return;
- }
-
--POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::UsesDef *tao_impl
-- ,
-- CORBA::Environment &
-+IR::ValueDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::base_value (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA::Environment &ACE_TRY_ENV
)
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Boolean result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_EventDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
--{
--private:
-- unsigned int hash (const char *str, unsigned int len);
--public:
-- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
--};
--/* starting time is 16:31:13 */
--/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EventDef_Perfect_Hash_OpTable -N lookup */
--unsigned int
--TAO_IR_EventDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- static const unsigned char asso_values[] =
-- {
--#if defined (ACE_MVS)
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 0, 0, 37, 37, 37, 10, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37,
--#else
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-- 0, 0, 37, 37, 37, 10, 37, 37, 37, 0,
-- 0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
-- 37, 10, 37, 37, 37, 37, 37, 37,
--#endif /* ACE_MVS */
-- };
-- return len + asso_values[str[len - 1]] + asso_values[str[0]];
-+ IR_ValueDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "base_value",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ValueDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ValueDef:1.0"
-+ )
-+ )->base_value (
-+ ACE_TRY_ENV
-+ );
- }
-
--const class TAO_operation_db_entry *
--TAO_IR_EventDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::base_value (
-+ CORBA_Object *_collocated_tao_target_,
-+ IR_ValueDef_ptr base_value,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- enum
-- {
-- TOTAL_KEYWORDS = 17,
-- MIN_WORD_LENGTH = 4,
-- MAX_WORD_LENGTH = 26,
-- MIN_HASH_VALUE = 4,
-- MAX_HASH_VALUE = 36,
-- HASH_VALUE_RANGE = 33,
-- DUPLICATES = 4
-- };
--
-- static const class TAO_operation_db_entry wordlist[] =
-- {
-- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::EventDef::move_skel},
-- {"_is_a", &POA_IR::EventDef::_is_a_skel},
-- {"_get_id", &POA_IR::EventDef::_get_id_skel},
-- {"_set_id", &POA_IR::EventDef::_set_id_skel},
-- {"describe", &POA_IR::EventDef::describe_skel},
-- {"_get_name", &POA_IR::EventDef::_get_name_skel},
-- {"_set_name", &POA_IR::EventDef::_set_name_skel},
-- {"_get_version", &POA_IR::EventDef::_get_version_skel},
-- {"_set_version", &POA_IR::EventDef::_set_version_skel},
-- {"_get_def_kind", &POA_IR::EventDef::_get_def_kind_skel},
-- {"is_a", &POA_IR::EventDef::is_a_skel},
-- {"_get_defined_in", &POA_IR::EventDef::_get_defined_in_skel},
-- {"destroy", &POA_IR::EventDef::destroy_skel},
-- {"_get_absolute_name", &POA_IR::EventDef::_get_absolute_name_skel},
-- {"_get_event", &POA_IR::EventDef::_get_event_skel},
-- {"_non_existent", &POA_IR::EventDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::EventDef::_get_containing_repository_skel},
-- };
--
-- static const signed char lookup[] =
-- {
-- -6, -2, -9, -2, 4, 5, -1, -43, 8, -43, -11, -2, -38, 13,
-- 14, 15, -1, 16, 17, -1, 18, -1, -1, 19, -1, -1, -1, -1,
-- -1, -1, -1, -1, -1, -1, -1, -1, 20,
-- };
--
-- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-- {
-- unsigned int key = hash (str, len);
--
-- if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-- {
-- int slot = lookup[key];
--
-- if (slot >= 0 && slot < MAX_HASH_VALUE)
-- {
-- const char *s = wordlist[slot].opname_;
--
-- if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-- return &wordlist[slot];
-- }
-- else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-- return 0;
-- else
-- {
-- unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-- const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-- const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
--
-- while (--ptr >= base)
-- if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-- return ptr;
-- }
-- }
-- }
-- return 0;
--}
--/* ending time is 16:31:13 */
--static TAO_IR_EventDef_Perfect_Hash_OpTable tao_IR_EventDef_optable;
--
--
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Implementation
--//
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "base_value",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::ValueDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ValueDef:1.0"
-+ )
-+ )->base_value (
-+ base_value,
-+ ACE_TRY_ENV
-+ );
-+ return;
-+}
-
--// Factory function Implementation.
--POA_IR::_TAO_EventDef_Strategized_Proxy_Broker *POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::the_TAO_EventDef_Strategized_Proxy_Broker (void)
-+IR::ValueDefSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- static POA_IR::_TAO_EventDef_Strategized_Proxy_Broker strategized_proxy_broker;
-- return &strategized_proxy_broker;
-+ IR_ValueDefSeq_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "abstract_base_values",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ValueDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ValueDef:1.0"
-+ )
-+ )->abstract_base_values (
-+ ACE_TRY_ENV
-+ );
- }
-
--POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::_TAO_EventDef_Strategized_Proxy_Broker (void)
-+void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
-+ CORBA_Object *_collocated_tao_target_,
-+ const IR_ValueDefSeq & abstract_base_values,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- this->proxy_cache_[i] = 0;
--
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "abstract_base_values",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::ValueDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ValueDef:1.0"
-+ )
-+ )->abstract_base_values (
-+ abstract_base_values,
-+ ACE_TRY_ENV
-+ );
-+ return;
- }
-
--POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::~_TAO_EventDef_Strategized_Proxy_Broker (void)
-+CORBA::Boolean POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- delete this->proxy_cache_[i];
--
-+ CORBA::Boolean _tao_retval = 0;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "is_abstract",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (_tao_retval);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ValueDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ValueDef:1.0"
-+ )
-+ )->is_abstract (
-+ ACE_TRY_ENV
-+ );
+ ACE_THROW_SPEC ((
+@@ -31376,7 +31259,7 @@
+ return;
}
--IR::_TAO_EventDef_Proxy_Impl&
--POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::EventDef *object,
-+void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Boolean is_abstract,
+-IR::ValueDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::base_value (
++IR_ValueDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::base_value (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
+@@ -31384,7 +31267,7 @@
+ CORBA::SystemException
+ ))
{
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-- TAO_ORB_Core::collocation_strategy (object);
--
-- if (this->proxy_cache_[strategy] != 0)
-- return *this->proxy_cache_[strategy];
--
-- this->create_proxy (strategy, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
--
-- return *this->proxy_cache_[strategy];
--
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "is_abstract",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::ValueDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ValueDef:1.0"
-+ )
-+ )->is_abstract (
-+ is_abstract,
-+ ACE_TRY_ENV
-+ );
-+ return;
- }
-
--void
--POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::create_proxy (
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-+CORBA::Boolean POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_custom (
-+ CORBA_Object *_collocated_tao_target_,
+- IR::ValueDef_var _tao_retval;
++ IR_ValueDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -31409,7 +31292,7 @@
+
+ void POA_IR::_TAO_ValueDef_ThruPOA_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
-+ ))
- {
-- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
--
-- if (this->proxy_cache_[strategy] == 0)
-- {
-- switch (strategy)
-- {
-- case TAO_ORB_Core::THRU_POA_STRATEGY:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- case TAO_ORB_Core::REMOTE_STRATEGY:
-- default:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- ::IR::_TAO_EventDef_Remote_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- }
--
-- }
-+ CORBA::Boolean _tao_retval = 0;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "is_custom",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (_tao_retval);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ValueDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ValueDef:1.0"
-+ )
-+ )->is_custom (
-+ ACE_TRY_ENV
-+ );
- }
-
-+void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_custom (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Boolean is_custom,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "is_custom",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::ValueDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ValueDef:1.0"
-+ )
-+ )->is_custom (
-+ is_custom,
-+ ACE_TRY_ENV
-+ );
-+ return;
-+}
-
--//
--// End Strategized Proxy Broker Implementation
--///////////////////////////////////////////////////////////////////////
--
--
--IR::_TAO_EventDef_Proxy_Broker *
--IR__TAO_EventDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+CORBA::Boolean POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::the_TAO_EventDef_Strategized_Proxy_Broker();
-+ CORBA::Boolean _tao_retval = 0;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "is_truncatable",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (_tao_retval);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ValueDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ValueDef:1.0"
-+ )
-+ )->is_truncatable (
-+ ACE_TRY_ENV
-+ );
+ ACE_THROW_SPEC ((
+@@ -31439,7 +31322,7 @@
+ return;
}
--int
--IR__TAO_EventDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Boolean is_truncatable,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- ACE_UNUSED_ARG (_dummy_);
--
-- IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_EventDef_Proxy_Broker_Factory_function;
--
-- return 0;
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "is_truncatable",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::ValueDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ValueDef:1.0"
-+ )
-+ )->is_truncatable (
-+ is_truncatable,
-+ ACE_TRY_ENV
-+ );
-+ return;
- }
+-IR::ValueDefSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
++IR_ValueDefSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -31447,7 +31330,7 @@
+ CORBA::SystemException
+ ))
+ {
+- IR::ValueDefSeq_var _tao_retval;
++ IR_ValueDefSeq_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -31472,7 +31355,7 @@
--static int IR__TAO_EventDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_EventDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_EventDef_Proxy_Broker_Factory_Initializer));
--
--
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Proxy Implementation
--//
--
--POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::_TAO_EventDef_ThruPOA_Proxy_Impl (void)
--{}
--
--// ThruPOA Implementation of the IDL interface methods
--
--CORBA::Boolean POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::is_a (
-+CORBA::Boolean POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_a (
+ void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
CORBA_Object *_collocated_tao_target_,
-- const char * event_id,
-+ const char * id,
+- const IR::ValueDefSeq & abstract_base_values,
++ const IR_ValueDefSeq & abstract_base_values,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -37412,25 +16971,30 @@
- );
- ACE_CHECK_RETURN (_tao_retval);
- return ACE_reinterpret_cast (
-- POA_IR::EventDef_ptr,
-+ POA_IR::ValueDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/EventDef:1.0"
-+ "IDL:omg.org/IR/ValueDef:1.0"
- )
- )->is_a (
-- event_id,
-+ id,
- ACE_TRY_ENV
+@@ -31724,12 +31607,12 @@
);
}
--IR::ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event (
-+IR::ValueMemberDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_value_member (
+-IR::ValueMemberDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_value_member (
++IR_ValueMemberDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_value_member (
CORBA_Object *_collocated_tao_target_,
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr type,
+ IR_IDLType_ptr type,
-+ CORBA::Visibility access,
+ CORBA::Visibility access,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
+@@ -31737,7 +31620,7 @@
CORBA::SystemException
))
{
-- IR::ValueDef_var _tao_retval;
+- IR::ValueMemberDef_var _tao_retval;
+ IR_ValueMemberDef_var _tao_retval;
ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -37438,17 +17002,114 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "event",
-+ "create_value_member",
- forward_to.out (),
- ACE_TRY_ENV
- );
- ACE_CHECK_RETURN (0);
- return ACE_reinterpret_cast (
-- POA_IR::EventDef_ptr,
-+ POA_IR::ValueDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/EventDef:1.0"
-+ "IDL:omg.org/IR/ValueDef:1.0"
- )
-- )->event (
-+ )->create_value_member (
-+ id,
-+ name,
-+ version,
-+ type,
-+ access,
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+IR::AttributeDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_attribute (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * id,
-+ const char * name,
-+ const char * version,
+@@ -31765,22 +31648,22 @@
+ );
+ }
+
+-IR::AttributeDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_attribute (
++IR_AttributeDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_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 ((
-+ CORBA::SystemException
-+ ))
-+{
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+- IR::AttributeDef_var _tao_retval;
+ IR_AttributeDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_attribute",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ValueDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ValueDef:1.0"
-+ )
-+ )->create_attribute (
-+ id,
-+ name,
-+ version,
-+ type,
-+ mode,
-+ get_exceptions,
-+ put_exceptions,
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+IR::OperationDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_operation (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -31810,23 +31693,23 @@
+ );
+ }
+
+-IR::OperationDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_operation (
++IR_OperationDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_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 ((
-+ CORBA::SystemException
-+ ))
-+{
-+ IR_OperationDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_operation",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ValueDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ValueDef:1.0"
-+ )
-+ )->create_operation (
-+ id,
-+ name,
-+ version,
-+ result,
-+ mode,
-+ params,
-+ exceptions,
-+ contexts,
- ACE_TRY_ENV
- );
- }
-@@ -37458,778 +17119,611 @@
- ///////////////////////////////////////////////////////////////////////
-
- // skeleton constructor
--POA_IR::EventDef::EventDef (void)
-+POA_IR::ValueDef::ValueDef (void)
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
{
-- this->optable_ = &tao_IR_EventDef_optable;
-+ this->optable_ = &tao_IR_ValueDef_optable;
- }
-
- // copy ctor
--POA_IR::EventDef::EventDef (const EventDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+- IR::OperationDef_var _tao_retval;
++ IR_OperationDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -31872,7 +31755,7 @@
+ : ACE_NESTED_CLASS (POA_IR,Container) (rhs),
+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+POA_IR::ValueDef::ValueDef (const ValueDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+ POA_CORBA_IRObject (rhs),
TAO_ServantBase (rhs)
{}
- // skeleton destructor
--POA_IR::EventDef::~EventDef (void)
-+POA_IR::ValueDef::~ValueDef (void)
+@@ -31890,7 +31773,7 @@
{
- }
-
--void POA_IR::EventDef::is_a_skel (
-+void POA_IR::ValueDef::_get_supported_interfaces_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *)_tao_object_reference;
--
-- CORBA::Boolean _tao_retval = 0;
-- CORBA::String_var event_id;
-- if (!(
-- (_tao_in >> event_id.out ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-
+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
+
+- IR::InterfaceDefSeq_var _tao_retval;
+ IR_InterfaceDefSeq_var _tao_retval;
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- event_id.in (),
-+ _tao_retval = _tao_impl->supported_interfaces (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->is_a (
-- event_id.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::Boolean _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
-- (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+}
-+
-+void POA_IR::ValueDef::_set_supported_interfaces_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -31917,7 +31800,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -31971,14 +31854,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+- IR::InterfaceDefSeq supported_interfaces;
+ IR_InterfaceDefSeq supported_interfaces;
-+ if (!(
-+ (_tao_in >> supported_interfaces)
+ if (!(
+ (_tao_in >> supported_interfaces)
))
-- ACE_THROW (CORBA::MARSHAL());
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_impl->supported_interfaces (
-+ supported_interfaces,
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
+ ACE_THROW (CORBA::MARSHAL());
-+ _tao_server_request.init_reply ();
- }
-
--void POA_IR::EventDef::_get_event_skel (
-+void POA_IR::ValueDef::_get_initializers_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -32049,7 +31930,7 @@
{
-- POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *)_tao_object_reference;
-+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-
-- IR::ValueDef_var _tao_retval;
+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
+
+- IR::InitializerSeq_var _tao_retval;
+ IR_InitializerSeq_var _tao_retval;
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->initializers (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->event (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
- (_tao_out << _tao_retval.in ())
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void POA_IR::EventDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-+void POA_IR::ValueDef::_set_initializers_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -32076,7 +31957,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::InitializerSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_InitializerSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -32130,14 +32011,12 @@
TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = 0;
-- CORBA::String_var value;
-- if (!(_tao_in >> value.out ()))
-- ACE_THROW (CORBA::MARSHAL ());
--
-- _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-+
+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+- IR::InitializerSeq initializers;
+ IR_InitializerSeq initializers;
-+ if (!(
-+ (_tao_in >> initializers)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_impl->initializers (
-+ initializers,
-+ ACE_TRY_ENV
-+ );
-+
- ACE_CHECK;
--
-+
- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
- }
+ if (!(
+ (_tao_in >> initializers)
+ ))
+ ACE_THROW (CORBA::MARSHAL());
--void POA_IR::EventDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-+void POA_IR::ValueDef::_get_base_value_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -32208,7 +32087,7 @@
{
-- POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-+
+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
+
+- IR::ValueDef_var _tao_retval;
+ IR_ValueDef_var _tao_retval;
-+
-+ _tao_retval = _tao_impl->base_value (
-+ ACE_TRY_ENV
-+ );
-+
- ACE_CHECK;
--
-+
- _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--CORBA::Boolean POA_IR::EventDef::_is_a (
-- const char* value,
-+void POA_IR::ValueDef::_set_base_value_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
- 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-- return 1;
-- else
-- return 0;
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
--void* POA_IR::EventDef::_downcast (
-- const char* logical_type_id
-- )
--{
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/EventDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::EventDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-- return ACE_static_cast (POA_IR::Contained_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-- return ACE_static_cast(PortableServer::Servant, this);
-- return 0;
--}
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -32235,7 +32114,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -32289,14 +32168,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+- IR::ValueDef_var base_value;
+ IR_ValueDef_var base_value;
-+ if (!(
-+ (_tao_in >> base_value.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--void POA_IR::EventDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
--{
-- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
--}
-+ _tao_impl->base_value (
-+ base_value.in (),
-+ ACE_TRY_ENV
-+ );
-
--const char* POA_IR::EventDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/EventDef:1.0";
--}
-+ ACE_CHECK;
-
--IR::EventDef*
--POA_IR::EventDef::_this (CORBA_Environment &ACE_TRY_ENV)
--{
-- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Object_ptr tmp = CORBA::Object::_nil ();
--
-- if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-- else
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
--
-- CORBA::Object_var obj = tmp;
-- return ::IR::EventDef::_unchecked_narrow (obj.in ());
-+ _tao_server_request.init_reply ();
- }
+ if (!(
+ (_tao_in >> base_value.out ())
+ ))
+ ACE_THROW (CORBA::MARSHAL());
-
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::TAO_ServerRequestInfo_IR_EventDef_is_a (
-+void POA_IR::ValueDef::_get_abstract_base_values_skel (
- TAO_ServerRequest &_tao_server_request,
-- POA_IR::EventDef *tao_impl
-- ,
-- const char * event_id,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- event_id_ (event_id)
--{}
--
--Dynamic::ParameterList *
--POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_event_id = parameter_list->length ();
-- parameter_list->length (length_event_id + 1);
-- (*parameter_list)[length_event_id].argument <<= event_id_;
-- (*parameter_list)[length_event_id].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-
--Dynamic::ExceptionList *
--POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -32367,7 +32244,7 @@
+ {
+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
+
+- IR::ValueDefSeq_var _tao_retval;
+ IR_ValueDefSeq_var _tao_retval;
--CORBA::Any *
--POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
--
-- return safe_result_any._retn ();
--}
-+ _tao_retval = _tao_impl->abstract_base_values (
-+ ACE_TRY_ENV
-+ );
-
--char *
--POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ ACE_CHECK;
-
--CORBA::Boolean
--POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void
--POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::result (CORBA::Boolean result)
-+void POA_IR::ValueDef::_set_abstract_base_values_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Update the result.
-- this->_result = result;
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-
--POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get::TAO_ServerRequestInfo_IR_EventDef_event_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::EventDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -32394,7 +32271,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ValueDefSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_ValueDefSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -32448,14 +32325,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+- IR::ValueDefSeq abstract_base_values;
+ IR_ValueDefSeq abstract_base_values;
-+ if (!(
-+ (_tao_in >> abstract_base_values)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--Dynamic::ParameterList *
--POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+ _tao_impl->abstract_base_values (
-+ abstract_base_values,
-+ ACE_TRY_ENV
-+ );
-
--Dynamic::ExceptionList *
--POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ ACE_CHECK;
-
--CORBA::Any *
--POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
-+ _tao_server_request.init_reply ();
- }
-
--char *
--POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::ValueDef::_get_is_abstract_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-
--CORBA::Boolean
--POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+ CORBA::Boolean _tao_retval = 0;
-
--void
--POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get::result (IR::ValueDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
-+ _tao_retval = _tao_impl->is_abstract (
-+ ACE_TRY_ENV
-+ );
-
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_EmitsDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
--{
--private:
-- unsigned int hash (const char *str, unsigned int len);
--public:
-- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
--};
--/* starting time is 16:31:13 */
--/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EmitsDef_Perfect_Hash_OpTable -N lookup */
--unsigned int
--TAO_IR_EmitsDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
--{
-- static const unsigned char asso_values[] =
-- {
--#if defined (ACE_MVS)
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 0, 0, 37, 37, 37, 10, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37,
--#else
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-- 0, 0, 37, 37, 37, 10, 37, 37, 37, 0,
-- 0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
-- 37, 10, 37, 37, 37, 37, 37, 37,
--#endif /* ACE_MVS */
-- };
-- return len + asso_values[str[len - 1]] + asso_values[str[0]];
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--const class TAO_operation_db_entry *
--TAO_IR_EmitsDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+void POA_IR::ValueDef::_set_is_abstract_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- enum
-- {
-- TOTAL_KEYWORDS = 17,
-- MIN_WORD_LENGTH = 4,
-- MAX_WORD_LENGTH = 26,
-- MIN_HASH_VALUE = 4,
-- MAX_HASH_VALUE = 36,
-- HASH_VALUE_RANGE = 33,
-- DUPLICATES = 4
-- };
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-+
-+ CORBA::Boolean is_abstract;
-+ if (!(
-+ (_tao_in >> CORBA::Any::to_boolean (is_abstract))
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
-- static const class TAO_operation_db_entry wordlist[] =
-- {
-- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::EmitsDef::move_skel},
-- {"_is_a", &POA_IR::EmitsDef::_is_a_skel},
-- {"_get_id", &POA_IR::EmitsDef::_get_id_skel},
-- {"_set_id", &POA_IR::EmitsDef::_set_id_skel},
-- {"describe", &POA_IR::EmitsDef::describe_skel},
-- {"_get_name", &POA_IR::EmitsDef::_get_name_skel},
-- {"_set_name", &POA_IR::EmitsDef::_set_name_skel},
-- {"_get_version", &POA_IR::EmitsDef::_get_version_skel},
-- {"_set_version", &POA_IR::EmitsDef::_set_version_skel},
-- {"_get_def_kind", &POA_IR::EmitsDef::_get_def_kind_skel},
-- {"is_a", &POA_IR::EmitsDef::is_a_skel},
-- {"_get_defined_in", &POA_IR::EmitsDef::_get_defined_in_skel},
-- {"destroy", &POA_IR::EmitsDef::destroy_skel},
-- {"_get_absolute_name", &POA_IR::EmitsDef::_get_absolute_name_skel},
-- {"_get_event", &POA_IR::EmitsDef::_get_event_skel},
-- {"_non_existent", &POA_IR::EmitsDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::EmitsDef::_get_containing_repository_skel},
-- };
-+ _tao_impl->is_abstract (
-+ is_abstract,
-+ ACE_TRY_ENV
-+ );
+ if (!(
+ (_tao_in >> abstract_base_values)
+ ))
+ ACE_THROW (CORBA::MARSHAL());
-- static const signed char lookup[] =
-- {
-- -6, -2, -9, -2, 4, 5, -1, -43, 8, -43, -11, -2, -38, 13,
-- 14, 15, -1, 16, 17, -1, 18, -1, -1, 19, -1, -1, -1, -1,
-- -1, -1, -1, -1, -1, -1, -1, -1, 20,
-- };
-+ ACE_CHECK;
-
-- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-- {
-- unsigned int key = hash (str, len);
-+ _tao_server_request.init_reply ();
-+}
-
-- if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-- {
-- int slot = lookup[key];
-+void POA_IR::ValueDef::_get_is_custom_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-
-- if (slot >= 0 && slot < MAX_HASH_VALUE)
-- {
-- const char *s = wordlist[slot].opname_;
-+ CORBA::Boolean _tao_retval = 0;
-
-- if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-- return &wordlist[slot];
-- }
-- else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-- return 0;
-- else
-- {
-- unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-- const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-- const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
-+ _tao_retval = _tao_impl->is_custom (
-+ ACE_TRY_ENV
-+ );
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -32606,14 +32481,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+ CORBA::Boolean is_abstract;
+ if (!(
+ (_tao_in >> CORBA::Any::to_boolean (is_abstract))
+ ))
+ ACE_THROW (CORBA::MARSHAL());
-- while (--ptr >= base)
-- if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-- return ptr;
-- }
-- }
-- }
-- return 0;
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
--/* ending time is 16:31:13 */
--static TAO_IR_EmitsDef_Perfect_Hash_OpTable tao_IR_EmitsDef_optable;
-
-+void POA_IR::ValueDef::_set_is_custom_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-+
-+ CORBA::Boolean is_custom;
-+ if (!(
-+ (_tao_in >> CORBA::Any::to_boolean (is_custom))
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Implementation
--//
-+ _tao_impl->is_custom (
-+ is_custom,
-+ ACE_TRY_ENV
-+ );
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -32764,14 +32637,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+ CORBA::Boolean is_custom;
+ if (!(
+ (_tao_in >> CORBA::Any::to_boolean (is_custom))
+ ))
+ ACE_THROW (CORBA::MARSHAL());
--// Factory function Implementation.
--POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker *POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::the_TAO_EmitsDef_Strategized_Proxy_Broker (void)
--{
-- static POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker strategized_proxy_broker;
-- return &strategized_proxy_broker;
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
- }
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -32922,14 +32793,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+ CORBA::Boolean is_truncatable;
+ if (!(
+ (_tao_in >> CORBA::Any::to_boolean (is_truncatable))
+ ))
+ ACE_THROW (CORBA::MARSHAL());
--POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::_TAO_EmitsDef_Strategized_Proxy_Broker (void)
-+void POA_IR::ValueDef::_get_is_truncatable_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- this->proxy_cache_[i] = 0;
--
-+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-+
-+ CORBA::Boolean _tao_retval = 0;
-+
-+ _tao_retval = _tao_impl->is_truncatable (
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::~_TAO_EmitsDef_Strategized_Proxy_Broker (void)
-+void POA_IR::ValueDef::_set_is_truncatable_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- delete this->proxy_cache_[i];
--
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-+
-+ CORBA::Boolean is_truncatable;
-+ if (!(
-+ (_tao_in >> CORBA::Any::to_boolean (is_truncatable))
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_impl->is_truncatable (
-+ is_truncatable,
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
- }
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -33008,7 +32877,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
--IR::_TAO_EmitsDef_Proxy_Impl&
--POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::EmitsDef *object,
-+void POA_IR::ValueDef::is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-- TAO_ORB_Core::collocation_strategy (object);
--
-- if (this->proxy_cache_[strategy] != 0)
-- return *this->proxy_cache_[strategy];
--
-- this->create_proxy (strategy, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
--
-- return *this->proxy_cache_[strategy];
--
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-+
-+ CORBA::Boolean _tao_retval = 0;
-+ CORBA::String_var id;
-+ if (!(
-+ (_tao_in >> id.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_retval = _tao_impl->is_a (
-+ id.in (),
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void
--POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::create_proxy (
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-+void POA_IR::ValueDef::create_value_member_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
--
-- if (this->proxy_cache_[strategy] == 0)
-- {
-- switch (strategy)
-- {
-- case TAO_ORB_Core::THRU_POA_STRATEGY:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- POA_IR::_TAO_EmitsDef_ThruPOA_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- case TAO_ORB_Core::REMOTE_STRATEGY:
-- default:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- ::IR::_TAO_EmitsDef_Remote_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- }
--
-- }
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -33089,11 +32957,11 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
+
+- IR::ValueMemberDef_var _tao_retval;
+ IR_ValueMemberDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
+- IR::IDLType_var type;
+ IR_IDLType_var type;
-+ CORBA::Visibility access;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> type.out ()) &&
-+ (_tao_in >> access)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_retval = _tao_impl->create_value_member (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ type.in (),
-+ access,
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
-+void POA_IR::ValueDef::create_attribute_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-
--//
--// End Strategized Proxy Broker Implementation
--///////////////////////////////////////////////////////////////////////
+ CORBA::Visibility access;
+ if (!(
+ (_tao_in >> id.out ()) &&
+@@ -33104,7 +32972,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -33140,7 +33007,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ValueMemberDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_ValueMemberDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -33194,14 +33061,14 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
+
+- IR::AttributeDef_var _tao_retval;
+ IR_AttributeDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
+- IR::IDLType_var type;
+- IR::AttributeMode mode;
+- IR::ExceptionDefSeq get_exceptions;
+- IR::ExceptionDefSeq put_exceptions;
+ IR_IDLType_var type;
+ IR_AttributeMode mode;
+ IR_ExceptionDefSeq get_exceptions;
+ IR_ExceptionDefSeq put_exceptions;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> type.out ()) &&
-+ (_tao_in >> mode) &&
-+ (_tao_in >> get_exceptions) &&
-+ (_tao_in >> put_exceptions)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_retval = _tao_impl->create_attribute (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ type.in (),
-+ mode,
-+ get_exceptions,
-+ put_exceptions,
-+ ACE_TRY_ENV
-+ );
-
-+ ACE_CHECK;
-
--IR::_TAO_EmitsDef_Proxy_Broker *
--IR__TAO_EmitsDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
--{
-- ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::the_TAO_EmitsDef_Strategized_Proxy_Broker();
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--int
--IR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+void POA_IR::ValueDef::create_operation_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- ACE_UNUSED_ARG (_dummy_);
--
-- IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_EmitsDef_Proxy_Broker_Factory_function;
--
-- return 0;
--}
--
--static int IR__TAO_EmitsDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer));
--
--
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Proxy Implementation
--//
--
--POA_IR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::_TAO_EmitsDef_ThruPOA_Proxy_Impl (void)
--{}
--
--// ThruPOA Implementation of the IDL interface methods
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-
--//
--// End ThruPOA Proxy Implementation
--///////////////////////////////////////////////////////////////////////
+ if (!(
+ (_tao_in >> id.out ()) &&
+ (_tao_in >> name.out ()) &&
+@@ -33213,7 +33080,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -33253,7 +33119,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::AttributeDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_AttributeDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -33307,15 +33173,15 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
+
+- IR::OperationDef_var _tao_retval;
+ IR_OperationDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
+- IR::IDLType_var result;
+- IR::OperationMode mode;
+- IR::ParDescriptionSeq params;
+- IR::ExceptionDefSeq exceptions;
+- IR::ContextIdSeq contexts;
+ IR_IDLType_var result;
+ IR_OperationMode mode;
+ IR_ParDescriptionSeq params;
+ IR_ExceptionDefSeq exceptions;
+ IR_ContextIdSeq contexts;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> result.out ()) &&
-+ (_tao_in >> mode) &&
-+ (_tao_in >> params) &&
-+ (_tao_in >> exceptions) &&
-+ (_tao_in >> contexts)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--// skeleton constructor
--POA_IR::EmitsDef::EmitsDef (void)
--{
-- this->optable_ = &tao_IR_EmitsDef_optable;
--}
-+ _tao_retval = _tao_impl->create_operation (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ result.in (),
-+ mode,
-+ params,
-+ exceptions,
-+ contexts,
-+ ACE_TRY_ENV
-+ );
-
--// copy ctor
--POA_IR::EmitsDef::EmitsDef (const EmitsDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,EventDef) (rhs),
-- ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-- TAO_ServantBase (rhs)
--{}
-+ ACE_CHECK;
-
--// skeleton destructor
--POA_IR::EmitsDef::~EmitsDef (void)
--{
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void POA_IR::EmitsDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::ValueDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::EmitsDef *_tao_impl = (POA_IR::EmitsDef *) _tao_object_reference;
-+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *) _tao_object_reference;
+ if (!(
+ (_tao_in >> id.out ()) &&
+ (_tao_in >> name.out ()) &&
+@@ -33328,7 +33194,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -33370,7 +33235,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::OperationDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_OperationDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -33425,7 +33290,7 @@
+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *) _tao_object_reference;
CORBA::Boolean _tao_retval = 0;
CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
ACE_THROW (CORBA::MARSHAL ());
--
-+
+
_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -33433,7 +33298,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -46471,21 +7862,8 @@
ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::EmitsDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::ValueDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::EmitsDef *_tao_impl = (POA_IR::EmitsDef *) _tao_object_reference;
-+ POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *) _tao_object_reference;
- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -33450,7 +33315,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -46493,511 +7871,278 @@
ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Boolean POA_IR::EmitsDef::_is_a (
-+CORBA::Boolean POA_IR::ValueDef::_is_a (
- const char* value,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
- if (
-- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EmitsDef:1.0")) ||
-- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
-+ (!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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
- return 1;
-@@ -38237,35 +17731,37 @@
- return 0;
- }
-
--void* POA_IR::EmitsDef::_downcast (
-+void* POA_IR::ValueDef::_downcast (
- const char* logical_type_id
- )
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/EmitsDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::EmitsDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/EventDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::EventDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ValueDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::ValueDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Container_ptr, this);
- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
- return ACE_static_cast (POA_IR::Contained_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-+ return ACE_static_cast (POA_IR::IDLType_ptr, this);
+@@ -33484,7 +33349,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
+ return ACE_static_cast (POA_IR::IDLType_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
- }
-
--void POA_IR::EmitsDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::ValueDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--const char* POA_IR::EmitsDef::_interface_repository_id (void) const
-+const char* POA_IR::ValueDef::_interface_repository_id (void) const
- {
-- return "IDL:omg.org/IR/EmitsDef:1.0";
-+ return "IDL:omg.org/IR/ValueDef:1.0";
- }
-
--IR::EmitsDef*
--POA_IR::EmitsDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+IR::ValueDef*
-+POA_IR::ValueDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-@@ -38278,24 +17774,21 @@
+@@ -33514,10 +33379,9 @@
ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
CORBA::Object_var obj = tmp;
-- return ::IR::EmitsDef::_unchecked_narrow (obj.in ());
+- return ::IR::ValueDef::_unchecked_narrow (obj.in ());
+ return IR_ValueDef::_unchecked_narrow (obj.in ());
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_PublishesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+class TAO_IR_ValueBoxDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -33597,7 +33461,7 @@
+ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::ValueDef *tao_impl,
+- const IR::InterfaceDefSeq & supported_interfaces,
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -33746,7 +33610,7 @@
+ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_set::TAO_ServerRequestInfo_IR_ValueDef_initializers_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::ValueDef *tao_impl,
+- const IR::InitializerSeq & initializers,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -33895,7 +33759,7 @@
+ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_set::TAO_ServerRequestInfo_IR_ValueDef_base_value_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::ValueDef *tao_impl,
+- IR::ValueDef_ptr base_value,
++ IR_ValueDef_ptr base_value,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -34044,7 +33908,7 @@
+ POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::ValueDef *tao_impl,
+- const IR::ValueDefSeq & abstract_base_values,
++ const IR_ValueDefSeq & abstract_base_values,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -34649,7 +34513,7 @@
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr type,
++ IR_IDLType_ptr type,
+ const CORBA::Visibility & access,
+ CORBA::Environment &
+ )
+@@ -34762,10 +34626,10 @@
+ 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 &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -34892,11 +34756,11 @@
+ 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 &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -35025,6 +34889,7 @@
+ }
+
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_ValueBoxDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
private:
- unsigned int hash (const char *str, unsigned int len);
+@@ -35032,7 +34897,7 @@
public:
const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
};
--/* starting time is 16:31:13 */
+-/* starting time is 18:47:28 */
+/* starting time is 11:23:11 */
/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PublishesDef_Perfect_Hash_OpTable -N lookup */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ValueBoxDef_Perfect_Hash_OpTable -N lookup */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ValueBoxDef_Perfect_Hash_OpTable -N lookup */
unsigned int
--TAO_IR_PublishesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+TAO_IR_ValueBoxDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
- static const unsigned char asso_values[] =
- {
-@@ -38313,7 +17806,7 @@
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 0, 0, 37, 37, 37, 10, 37, 37,
-+ 37, 37, 0, 0, 0, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
-@@ -38337,7 +17830,7 @@
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-- 0, 0, 37, 37, 37, 10, 37, 37, 37, 0,
-+ 0, 0, 0, 37, 37, 37, 37, 37, 37, 0,
- 0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
- 37, 10, 37, 37, 37, 37, 37, 37,
- #endif /* ACE_MVS */
-@@ -38346,46 +17839,47 @@
- }
-
- const class TAO_operation_db_entry *
--TAO_IR_PublishesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+TAO_IR_ValueBoxDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
- enum
- {
-- TOTAL_KEYWORDS = 17,
-+ TOTAL_KEYWORDS = 18,
- MIN_WORD_LENGTH = 4,
- MAX_WORD_LENGTH = 26,
- MIN_HASH_VALUE = 4,
- MAX_HASH_VALUE = 36,
- HASH_VALUE_RANGE = 33,
-- DUPLICATES = 4
-+ DUPLICATES = 6
- };
-
- static const class TAO_operation_db_entry wordlist[] =
- {
- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::PublishesDef::move_skel},
-- {"_is_a", &POA_IR::PublishesDef::_is_a_skel},
-- {"_get_id", &POA_IR::PublishesDef::_get_id_skel},
-- {"_set_id", &POA_IR::PublishesDef::_set_id_skel},
-- {"describe", &POA_IR::PublishesDef::describe_skel},
-- {"_get_name", &POA_IR::PublishesDef::_get_name_skel},
-- {"_set_name", &POA_IR::PublishesDef::_set_name_skel},
-- {"_get_version", &POA_IR::PublishesDef::_get_version_skel},
-- {"_set_version", &POA_IR::PublishesDef::_set_version_skel},
-- {"_get_def_kind", &POA_IR::PublishesDef::_get_def_kind_skel},
-- {"is_a", &POA_IR::PublishesDef::is_a_skel},
-- {"_get_defined_in", &POA_IR::PublishesDef::_get_defined_in_skel},
-- {"destroy", &POA_IR::PublishesDef::destroy_skel},
-- {"_get_absolute_name", &POA_IR::PublishesDef::_get_absolute_name_skel},
-- {"_get_event", &POA_IR::PublishesDef::_get_event_skel},
-- {"_non_existent", &POA_IR::PublishesDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::PublishesDef::_get_containing_repository_skel},
-+ {"move", &POA_IR::ValueBoxDef::move_skel},
-+ {"_is_a", &POA_IR::ValueBoxDef::_is_a_skel},
-+ {"_get_id", &POA_IR::ValueBoxDef::_get_id_skel},
-+ {"_set_id", &POA_IR::ValueBoxDef::_set_id_skel},
-+ {"describe", &POA_IR::ValueBoxDef::describe_skel},
-+ {"_get_name", &POA_IR::ValueBoxDef::_get_name_skel},
-+ {"_get_type", &POA_IR::ValueBoxDef::_get_type_skel},
-+ {"_set_name", &POA_IR::ValueBoxDef::_set_name_skel},
-+ {"_get_version", &POA_IR::ValueBoxDef::_get_version_skel},
-+ {"_set_version", &POA_IR::ValueBoxDef::_set_version_skel},
-+ {"_get_def_kind", &POA_IR::ValueBoxDef::_get_def_kind_skel},
-+ {"_get_defined_in", &POA_IR::ValueBoxDef::_get_defined_in_skel},
-+ {"destroy", &POA_IR::ValueBoxDef::destroy_skel},
-+ {"_get_absolute_name", &POA_IR::ValueBoxDef::_get_absolute_name_skel},
-+ {"_get_original_type_def", &POA_IR::ValueBoxDef::_get_original_type_def_skel},
-+ {"_set_original_type_def", &POA_IR::ValueBoxDef::_set_original_type_def_skel},
-+ {"_non_existent", &POA_IR::ValueBoxDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::ValueBoxDef::_get_containing_repository_skel},
- };
-
- static const signed char lookup[] =
- {
-- -6, -2, -9, -2, 4, 5, -1, -43, 8, -43, -11, -2, -38, 13,
-- 14, 15, -1, 16, 17, -1, 18, -1, -1, 19, -1, -1, -1, -1,
-- -1, -1, -1, -1, -1, -1, -1, -1, 20,
-+ -6, -2, -9, -3, 4, 5, -1, -43, 8, -43, -12, -2, -38, 14,
-+ -1, 15, -1, 16, 17, -1, -18, -2, -38, 20, -1, -1, -1, -1,
-+ -1, -1, -1, -1, -1, -1, -1, -1, 21,
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -38419,38 +17913,37 @@
+@@ -35161,10 +35026,9 @@
}
return 0;
}
--/* ending time is 16:31:13 */
--static TAO_IR_PublishesDef_Perfect_Hash_OpTable tao_IR_PublishesDef_optable;
--
+-/* ending time is 18:47:28 */
+/* ending time is 11:23:11 */
-+static TAO_IR_ValueBoxDef_Perfect_Hash_OpTable tao_IR_ValueBoxDef_optable;
+ static TAO_IR_ValueBoxDef_Perfect_Hash_OpTable tao_IR_ValueBoxDef_optable;
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Implementation
//
-
- // Factory function Implementation.
--POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker *POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::the_TAO_PublishesDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker *POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::the_TAO_ValueBoxDef_Strategized_Proxy_Broker (void)
- {
-- static POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ static POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker strategized_proxy_broker;
- return &strategized_proxy_broker;
- }
-
--POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::_TAO_PublishesDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::_TAO_ValueBoxDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- this->proxy_cache_[i] = 0;
+@@ -35190,9 +35054,9 @@
}
--POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::~_TAO_PublishesDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::~_TAO_ValueBoxDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- delete this->proxy_cache_[i];
-
- }
-
--IR::_TAO_PublishesDef_Proxy_Impl&
--POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::PublishesDef *object,
+-IR::_TAO_ValueBoxDef_Proxy_Impl&
+_TAO_ValueBoxDef_Proxy_Impl&
-+POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::select_proxy (
+ POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::ValueBoxDef *object,
+ IR_ValueBoxDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -38468,7 +17961,7 @@
- }
-
- void
--POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::create_proxy (
-+POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::create_proxy (
- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -38482,7 +17975,7 @@
+@@ -35224,7 +35088,7 @@
case TAO_ORB_Core::THRU_POA_STRATEGY:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
-- POA_IR::_TAO_PublishesDef_ThruPOA_Proxy_Impl,
+- POA_IR::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl,
+ _TAO_ValueBoxDef_ThruPOA_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -38492,7 +17985,7 @@
+@@ -35234,7 +35098,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
-- ::IR::_TAO_PublishesDef_Remote_Proxy_Impl,
+- ::IR::_TAO_ValueBoxDef_Remote_Proxy_Impl,
+ _TAO_ValueBoxDef_Remote_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -38503,115 +17996,234 @@
- }
- }
+@@ -35251,26 +35115,26 @@
+ ///////////////////////////////////////////////////////////////////////
--
-+
-+//
-+// End Strategized Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-+
+
+-IR::_TAO_ValueBoxDef_Proxy_Broker *
+-IR__TAO_ValueBoxDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_ValueBoxDef_Proxy_Broker *
+_TAO_ValueBoxDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+{
-+ ACE_UNUSED_ARG (obj);
-+ return ::POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::the_TAO_ValueBoxDef_Strategized_Proxy_Broker();
-+}
-+
-+int
-+_TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+{
-+ ACE_UNUSED_ARG (_dummy_);
-+
-+ _TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer =
-+ _TAO_ValueBoxDef_Proxy_Broker_Factory_function;
-+
-+ return 0;
-+}
-+
-+static int _TAO_ValueBoxDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-+ _TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer));
-+
-+
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Proxy Implementation
-+//
-+
-+POA_IR::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::~_TAO_ValueBoxDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+// ThruPOA Implementation of the IDL interface methods
-+
-+IR::IDLType_ptr POA_IR::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+ IR_IDLType_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "original_type_def",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ValueBoxDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ValueBoxDef:1.0"
-+ )
-+ )->original_type_def (
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+void POA_IR::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
-+ CORBA_Object *_collocated_tao_target_,
-+ IR_IDLType_ptr original_type_def,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "original_type_def",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::ValueBoxDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ValueBoxDef:1.0"
-+ )
-+ )->original_type_def (
-+ original_type_def,
-+ ACE_TRY_ENV
-+ );
-+ return;
-+}
-+
- //
--// End Strategized Proxy Broker Implementation
-+// End ThruPOA Proxy Implementation
- ///////////////////////////////////////////////////////////////////////
-
--
--IR::_TAO_PublishesDef_Proxy_Broker *
--IR__TAO_PublishesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+// skeleton constructor
-+POA_IR::ValueBoxDef::ValueBoxDef (void)
{
-- ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::the_TAO_PublishesDef_Strategized_Proxy_Broker();
-+ this->optable_ = &tao_IR_ValueBoxDef_optable;
+ ACE_UNUSED_ARG (obj);
+ return ::POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::the_TAO_ValueBoxDef_Strategized_Proxy_Broker();
}
--int
--IR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+// copy ctor
-+POA_IR::ValueBoxDef::ValueBoxDef (const ValueBoxDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,TypedefDef) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
-+ POA_CORBA_IRObject (rhs),
-+ TAO_ServantBase (rhs)
-+{}
-+
-+// skeleton destructor
-+POA_IR::ValueBoxDef::~ValueBoxDef (void)
+ int
+-IR__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (long _dummy_)
++_TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
-- ACE_UNUSED_ARG (_dummy_);
--
-- IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_PublishesDef_Proxy_Broker_Factory_function;
--
-- return 0;
+ ACE_UNUSED_ARG (_dummy_);
+
+- IR__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_ValueBoxDef_Proxy_Broker_Factory_function;
++ _TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer =
++ _TAO_ValueBoxDef_Proxy_Broker_Factory_function;
+
+ return 0;
}
--static int IR__TAO_PublishesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer));
--
-+void POA_IR::ValueBoxDef::_get_original_type_def_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ POA_IR::ValueBoxDef *_tao_impl = (POA_IR::ValueBoxDef *)_tao_object_reference;
-
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Proxy Implementation
--//
-+ IR_IDLType_var _tao_retval;
+-static int IR__TAO_ValueBoxDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer));
++static int _TAO_ValueBoxDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
++ _TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer));
--POA_IR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::_TAO_PublishesDef_ThruPOA_Proxy_Impl (void)
--{}
-+ _tao_retval = _tao_impl->original_type_def (
-+ ACE_TRY_ENV
-+ );
--// ThruPOA Implementation of the IDL interface methods
-+ ACE_CHECK;
-
--//
--// End ThruPOA Proxy Implementation
--///////////////////////////////////////////////////////////////////////
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+}
-
--// skeleton constructor
--POA_IR::PublishesDef::PublishesDef (void)
-+void POA_IR::ValueBoxDef::_set_original_type_def_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- this->optable_ = &tao_IR_PublishesDef_optable;
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ValueBoxDef *_tao_impl = (POA_IR::ValueBoxDef *)_tao_object_reference;
+ ///////////////////////////////////////////////////////////////////////
+@@ -35282,7 +35146,7 @@
--// copy ctor
--POA_IR::PublishesDef::PublishesDef (const PublishesDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,EventDef) (rhs),
-- ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-- TAO_ServantBase (rhs)
--{}
-+ IR_IDLType_var original_type_def;
-+ if (!(
-+ (_tao_in >> original_type_def.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
+ // ThruPOA Implementation of the IDL interface methods
--// skeleton destructor
--POA_IR::PublishesDef::~PublishesDef (void)
--{
-+ _tao_impl->original_type_def (
-+ original_type_def.in (),
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
- }
+-IR::IDLType_ptr POA_IR::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
++IR_IDLType_ptr POA_IR::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -35290,7 +35154,7 @@
+ CORBA::SystemException
+ ))
+ {
+- IR::IDLType_var _tao_retval;
++ IR_IDLType_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -35315,7 +35179,7 @@
--void POA_IR::PublishesDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::ValueBoxDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
+ void POA_IR::_TAO_ValueBoxDef_ThruPOA_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 ((
+@@ -35360,7 +35224,7 @@
+ : ACE_NESTED_CLASS (POA_IR,TypedefDef) (rhs),
+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
++ POA_CORBA_IRObject (rhs),
+ TAO_ServantBase (rhs)
+ {}
+
+@@ -35378,7 +35242,7 @@
{
+ POA_IR::ValueBoxDef *_tao_impl = (POA_IR::ValueBoxDef *)_tao_object_reference;
+
+- IR::IDLType_var _tao_retval;
++ IR_IDLType_var _tao_retval;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -35405,7 +35269,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -35459,14 +35323,12 @@
TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::PublishesDef *_tao_impl = (POA_IR::PublishesDef *) _tao_object_reference;
-+ POA_IR::ValueBoxDef *_tao_impl = (POA_IR::ValueBoxDef *) _tao_object_reference;
+ POA_IR::ValueBoxDef *_tao_impl = (POA_IR::ValueBoxDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+- IR::IDLType_var original_type_def;
++ IR_IDLType_var original_type_def;
+ if (!(
+ (_tao_in >> original_type_def.out ())
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -35539,7 +35401,7 @@
+ POA_IR::ValueBoxDef *_tao_impl = (POA_IR::ValueBoxDef *) _tao_object_reference;
CORBA::Boolean _tao_retval = 0;
CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
ACE_THROW (CORBA::MARSHAL ());
--
-+
+
_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -35547,7 +35409,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -47005,21 +8150,8 @@
ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::PublishesDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::ValueBoxDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::PublishesDef *_tao_impl = (POA_IR::PublishesDef *) _tao_object_reference;
-+ POA_IR::ValueBoxDef *_tao_impl = (POA_IR::ValueBoxDef *) _tao_object_reference;
- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -35564,7 +35426,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -47027,413 +8159,185 @@
ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Boolean POA_IR::PublishesDef::_is_a (
-+CORBA::Boolean POA_IR::ValueBoxDef::_is_a (
- const char* value,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
- if (
-- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PublishesDef:1.0")) ||
-- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
-+ (!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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
- return 1;
-@@ -38619,35 +18231,37 @@
- return 0;
- }
-
--void* POA_IR::PublishesDef::_downcast (
-+void* POA_IR::ValueBoxDef::_downcast (
- const char* logical_type_id
- )
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/PublishesDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::PublishesDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/EventDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::EventDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ValueBoxDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::ValueBoxDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/TypedefDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::TypedefDef_ptr, this);
- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
- return ACE_static_cast (POA_IR::Contained_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-+ return ACE_static_cast (POA_IR::IDLType_ptr, this);
+@@ -35598,7 +35460,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
+ return ACE_static_cast (POA_IR::IDLType_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
- }
-
--void POA_IR::PublishesDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::ValueBoxDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--const char* POA_IR::PublishesDef::_interface_repository_id (void) const
-+const char* POA_IR::ValueBoxDef::_interface_repository_id (void) const
- {
-- return "IDL:omg.org/IR/PublishesDef:1.0";
-+ return "IDL:omg.org/IR/ValueBoxDef:1.0";
- }
-
--IR::PublishesDef*
--POA_IR::PublishesDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+IR::ValueBoxDef*
-+POA_IR::ValueBoxDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-@@ -38660,24 +18274,21 @@
+@@ -35628,10 +35490,9 @@
ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
CORBA::Object_var obj = tmp;
-- return ::IR::PublishesDef::_unchecked_narrow (obj.in ());
+- return ::IR::ValueBoxDef::_unchecked_narrow (obj.in ());
+ return IR_ValueBoxDef::_unchecked_narrow (obj.in ());
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_ConsumesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+class TAO_IR_ProvidesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -35711,7 +35572,7 @@
+ POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::ValueBoxDef *tao_impl,
+- IR::IDLType_ptr original_type_def,
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -35783,6 +35644,7 @@
+ }
+
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_ProvidesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
private:
- unsigned int hash (const char *str, unsigned int len);
+@@ -35790,7 +35652,7 @@
public:
const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
};
--/* starting time is 16:31:13 */
+-/* starting time is 18:47:29 */
+/* starting time is 11:23:11 */
/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ConsumesDef_Perfect_Hash_OpTable -N lookup */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ProvidesDef_Perfect_Hash_OpTable -N lookup */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ProvidesDef_Perfect_Hash_OpTable -N lookup */
unsigned int
--TAO_IR_ConsumesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+TAO_IR_ProvidesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
- static const unsigned char asso_values[] =
- {
-@@ -38695,7 +18306,7 @@
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 0, 0, 37, 37, 37, 10, 37, 37,
-+ 37, 37, 0, 0, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
-@@ -38719,7 +18330,7 @@
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
- 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-- 0, 0, 37, 37, 37, 10, 37, 37, 37, 0,
-+ 0, 0, 37, 37, 37, 37, 37, 37, 37, 0,
- 0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
- 37, 10, 37, 37, 37, 37, 37, 37,
- #endif /* ACE_MVS */
-@@ -38728,11 +18339,11 @@
- }
-
- const class TAO_operation_db_entry *
--TAO_IR_ConsumesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+TAO_IR_ProvidesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
- enum
- {
-- TOTAL_KEYWORDS = 17,
-+ TOTAL_KEYWORDS = 16,
- MIN_WORD_LENGTH = 4,
- MAX_WORD_LENGTH = 26,
- MIN_HASH_VALUE = 4,
-@@ -38744,30 +18355,29 @@
- static const class TAO_operation_db_entry wordlist[] =
- {
- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::ConsumesDef::move_skel},
-- {"_is_a", &POA_IR::ConsumesDef::_is_a_skel},
-- {"_get_id", &POA_IR::ConsumesDef::_get_id_skel},
-- {"_set_id", &POA_IR::ConsumesDef::_set_id_skel},
-- {"describe", &POA_IR::ConsumesDef::describe_skel},
-- {"_get_name", &POA_IR::ConsumesDef::_get_name_skel},
-- {"_set_name", &POA_IR::ConsumesDef::_set_name_skel},
-- {"_get_version", &POA_IR::ConsumesDef::_get_version_skel},
-- {"_set_version", &POA_IR::ConsumesDef::_set_version_skel},
-- {"_get_def_kind", &POA_IR::ConsumesDef::_get_def_kind_skel},
-- {"is_a", &POA_IR::ConsumesDef::is_a_skel},
-- {"_get_defined_in", &POA_IR::ConsumesDef::_get_defined_in_skel},
-- {"destroy", &POA_IR::ConsumesDef::destroy_skel},
-- {"_get_absolute_name", &POA_IR::ConsumesDef::_get_absolute_name_skel},
-- {"_get_event", &POA_IR::ConsumesDef::_get_event_skel},
-- {"_non_existent", &POA_IR::ConsumesDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::ConsumesDef::_get_containing_repository_skel},
-+ {"move", &POA_IR::ProvidesDef::move_skel},
-+ {"_is_a", &POA_IR::ProvidesDef::_is_a_skel},
-+ {"_get_id", &POA_IR::ProvidesDef::_get_id_skel},
-+ {"_set_id", &POA_IR::ProvidesDef::_set_id_skel},
-+ {"describe", &POA_IR::ProvidesDef::describe_skel},
-+ {"_get_name", &POA_IR::ProvidesDef::_get_name_skel},
-+ {"_set_name", &POA_IR::ProvidesDef::_set_name_skel},
-+ {"_get_version", &POA_IR::ProvidesDef::_get_version_skel},
-+ {"_set_version", &POA_IR::ProvidesDef::_set_version_skel},
-+ {"_get_def_kind", &POA_IR::ProvidesDef::_get_def_kind_skel},
-+ {"_get_defined_in", &POA_IR::ProvidesDef::_get_defined_in_skel},
-+ {"destroy", &POA_IR::ProvidesDef::destroy_skel},
-+ {"_get_absolute_name", &POA_IR::ProvidesDef::_get_absolute_name_skel},
-+ {"_get_interface_type", &POA_IR::ProvidesDef::_get_interface_type_skel},
-+ {"_non_existent", &POA_IR::ProvidesDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::ProvidesDef::_get_containing_repository_skel},
- };
-
- static const signed char lookup[] =
- {
-- -6, -2, -9, -2, 4, 5, -1, -43, 8, -43, -11, -2, -38, 13,
-- 14, 15, -1, 16, 17, -1, 18, -1, -1, 19, -1, -1, -1, -1,
-- -1, -1, -1, -1, -1, -1, -1, -1, 20,
-+ -6, -2, -9, -2, 4, 5, -1, -43, 8, -43, -11, -2, -38, 13,
-+ -1, 14, -1, 15, 16, 17, -1, -1, -1, 18, -1, -1, -1, -1,
-+ -1, -1, -1, -1, -1, -1, -1, -1, 19,
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -38801,38 +18411,37 @@
+@@ -35917,10 +35779,9 @@
}
return 0;
}
--/* ending time is 16:31:13 */
--static TAO_IR_ConsumesDef_Perfect_Hash_OpTable tao_IR_ConsumesDef_optable;
--
+-/* ending time is 18:47:29 */
+/* ending time is 11:23:11 */
-+static TAO_IR_ProvidesDef_Perfect_Hash_OpTable tao_IR_ProvidesDef_optable;
+ static TAO_IR_ProvidesDef_Perfect_Hash_OpTable tao_IR_ProvidesDef_optable;
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Implementation
//
-
- // Factory function Implementation.
--POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker *POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::the_TAO_ConsumesDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker *POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::the_TAO_ProvidesDef_Strategized_Proxy_Broker (void)
- {
-- static POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ static POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker strategized_proxy_broker;
- return &strategized_proxy_broker;
- }
-
--POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::_TAO_ConsumesDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::_TAO_ProvidesDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- this->proxy_cache_[i] = 0;
+@@ -35946,9 +35807,9 @@
}
--POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::~_TAO_ConsumesDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::~_TAO_ProvidesDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- delete this->proxy_cache_[i];
-
- }
-
--IR::_TAO_ConsumesDef_Proxy_Impl&
--POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::ConsumesDef *object,
+-IR::_TAO_ProvidesDef_Proxy_Impl&
+_TAO_ProvidesDef_Proxy_Impl&
-+POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::select_proxy (
+ POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::ProvidesDef *object,
+ IR_ProvidesDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -38850,7 +18459,7 @@
- }
-
- void
--POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::create_proxy (
-+POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::create_proxy (
- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -38864,7 +18473,7 @@
+@@ -35980,7 +35841,7 @@
case TAO_ORB_Core::THRU_POA_STRATEGY:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
-- POA_IR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl,
+- POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl,
+ _TAO_ProvidesDef_ThruPOA_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -38874,7 +18483,7 @@
+@@ -35990,7 +35851,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
-- ::IR::_TAO_ConsumesDef_Remote_Proxy_Impl,
+- ::IR::_TAO_ProvidesDef_Remote_Proxy_Impl,
+ _TAO_ProvidesDef_Remote_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -38891,108 +18500,165 @@
+@@ -36007,26 +35868,26 @@
///////////////////////////////////////////////////////////////////////
--IR::_TAO_ConsumesDef_Proxy_Broker *
--IR__TAO_ConsumesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+-IR::_TAO_ProvidesDef_Proxy_Broker *
+-IR__TAO_ProvidesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_ProvidesDef_Proxy_Broker *
+_TAO_ProvidesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::the_TAO_ConsumesDef_Strategized_Proxy_Broker();
-+ return ::POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::the_TAO_ProvidesDef_Strategized_Proxy_Broker();
+ return ::POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::the_TAO_ProvidesDef_Strategized_Proxy_Broker();
}
int
--IR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+-IR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
ACE_UNUSED_ARG (_dummy_);
-- IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_ConsumesDef_Proxy_Broker_Factory_function;
+- IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_ProvidesDef_Proxy_Broker_Factory_function;
+ _TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer =
+ _TAO_ProvidesDef_Proxy_Broker_Factory_function;
return 0;
}
--static int IR__TAO_ConsumesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer));
+-static int IR__TAO_ProvidesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_ProvidesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+ _TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ProvidesDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
- // ThruPOA Proxy Implementation
- //
-
--POA_IR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::_TAO_ConsumesDef_ThruPOA_Proxy_Impl (void)
-+POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_TAO_ProvidesDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::~_TAO_ProvidesDef_ThruPOA_Proxy_Impl (void)
- {}
+@@ -36038,7 +35899,7 @@
// ThruPOA Implementation of the IDL interface methods
-+IR::InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_type (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+ IR_InterfaceDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "interface_type",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ProvidesDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ProvidesDef:1.0"
-+ )
-+ )->interface_type (
-+ ACE_TRY_ENV
-+ );
-+}
-+
- //
- // End ThruPOA Proxy Implementation
- ///////////////////////////////////////////////////////////////////////
-
- // skeleton constructor
--POA_IR::ConsumesDef::ConsumesDef (void)
-+POA_IR::ProvidesDef::ProvidesDef (void)
+-IR::InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_type (
++IR_InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -36046,7 +35907,7 @@
+ CORBA::SystemException
+ ))
{
-- this->optable_ = &tao_IR_ConsumesDef_optable;
-+ this->optable_ = &tao_IR_ProvidesDef_optable;
- }
-
+- IR::InterfaceDef_var _tao_retval;
++ IR_InterfaceDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -36082,7 +35943,7 @@
// copy ctor
--POA_IR::ConsumesDef::ConsumesDef (const ConsumesDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,EventDef) (rhs),
-- ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ POA_IR::ProvidesDef::ProvidesDef (const ProvidesDef& rhs)
+ : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+POA_IR::ProvidesDef::ProvidesDef (const ProvidesDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ POA_CORBA_IRObject (rhs),
TAO_ServantBase (rhs)
{}
- // skeleton destructor
--POA_IR::ConsumesDef::~ConsumesDef (void)
-+POA_IR::ProvidesDef::~ProvidesDef (void)
+@@ -36100,7 +35961,7 @@
{
- }
-
--void POA_IR::ConsumesDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::ProvidesDef::_get_interface_type_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *)_tao_object_reference;
-+
+ POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *)_tao_object_reference;
+
+- IR::InterfaceDef_var _tao_retval;
+ IR_InterfaceDef_var _tao_retval;
-+
-+ _tao_retval = _tao_impl->interface_type (
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+}
-+
-+void POA_IR::ProvidesDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ConsumesDef *_tao_impl = (POA_IR::ConsumesDef *) _tao_object_reference;
-+ POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *) _tao_object_reference;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -36127,7 +35988,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -36182,7 +36043,7 @@
+ POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *) _tao_object_reference;
CORBA::Boolean _tao_retval = 0;
CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
ACE_THROW (CORBA::MARSHAL ());
--
-+
+
_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -36190,7 +36051,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -47441,21 +8345,8 @@
ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::ConsumesDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::ProvidesDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::ConsumesDef *_tao_impl = (POA_IR::ConsumesDef *) _tao_object_reference;
-+ POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *) _tao_object_reference;
- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -36207,7 +36068,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -47463,37 +8354,7 @@
ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Boolean POA_IR::ConsumesDef::_is_a (
-+CORBA::Boolean POA_IR::ProvidesDef::_is_a (
- const char* value,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
- if (
-- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ConsumesDef:1.0")) ||
-- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
-+ (!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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-@@ -39001,35 +18667,33 @@
- return 0;
- }
-
--void* POA_IR::ConsumesDef::_downcast (
-- const char* logical_type_id
-- )
--{
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ConsumesDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::ConsumesDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/EventDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::EventDef_ptr, this);
-+void* POA_IR::ProvidesDef::_downcast (
-+ const char* logical_type_id
-+ )
-+{
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ProvidesDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::ProvidesDef_ptr, this);
+@@ -36235,7 +36096,7 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
return ACE_static_cast (POA_IR::Contained_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
@@ -47502,2910 +8363,511 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
- }
-
--void POA_IR::ConsumesDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::ProvidesDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--const char* POA_IR::ConsumesDef::_interface_repository_id (void) const
-+const char* POA_IR::ProvidesDef::_interface_repository_id (void) const
- {
-- return "IDL:omg.org/IR/ConsumesDef:1.0";
-+ return "IDL:omg.org/IR/ProvidesDef:1.0";
- }
-
--IR::ConsumesDef*
--POA_IR::ConsumesDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+IR::ProvidesDef*
-+POA_IR::ProvidesDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-@@ -39042,154 +18706,111 @@
+@@ -36265,10 +36126,9 @@
ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
CORBA::Object_var obj = tmp;
-- return ::IR::ConsumesDef::_unchecked_narrow (obj.in ());
+- return ::IR::ProvidesDef::_unchecked_narrow (obj.in ());
+ return IR_ProvidesDef::_unchecked_narrow (obj.in ());
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_ComponentDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+class TAO_IR_UsesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -36346,6 +36206,7 @@
+ }
+
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_UsesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
private:
- unsigned int hash (const char *str, unsigned int len);
+@@ -36353,7 +36214,7 @@
public:
const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
};
--/* starting time is 16:31:13 */
+-/* starting time is 18:47:29 */
+/* starting time is 11:23:11 */
/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ComponentDef_Perfect_Hash_OpTable -N lookup */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_UsesDef_Perfect_Hash_OpTable -N lookup */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_UsesDef_Perfect_Hash_OpTable -N lookup */
unsigned int
--TAO_IR_ComponentDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+TAO_IR_UsesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
- static const unsigned char asso_values[] =
- {
- #if defined (ACE_MVS)
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 0,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 0,
-- 82, 30, 5, 10, 82, 82, 82, 0, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 45, 30, 15,
-- 82, 30, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 0, 20, 82, 82, 82, 30, 25, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 0, 0, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37,
- #else
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-- 82, 82, 82, 82, 82, 0, 82, 0, 82, 30,
-- 5, 10, 82, 82, 82, 0, 82, 82, 45, 30,
-- 15, 82, 30, 82, 82, 0, 20, 82, 82, 82,
-- 30, 25, 82, 82, 82, 82, 82, 82,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-+ 0, 0, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
-+ 37, 10, 37, 37, 37, 37, 37, 37,
- #endif /* ACE_MVS */
- };
- return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
- const class TAO_operation_db_entry *
--TAO_IR_ComponentDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+TAO_IR_UsesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
- enum
- {
-- TOTAL_KEYWORDS = 54,
-+ TOTAL_KEYWORDS = 17,
- MIN_WORD_LENGTH = 4,
- MAX_WORD_LENGTH = 26,
- MIN_HASH_VALUE = 4,
-- MAX_HASH_VALUE = 81,
-- HASH_VALUE_RANGE = 78,
-- DUPLICATES = 16
-+ MAX_HASH_VALUE = 36,
-+ HASH_VALUE_RANGE = 33,
-+ DUPLICATES = 4
- };
-
- static const class TAO_operation_db_entry wordlist[] =
- {
- {"",0},{"",0},{"",0},{"",0},
-- {"is_a", &POA_IR::ComponentDef::is_a_skel},
-- {"_is_a", &POA_IR::ComponentDef::_is_a_skel},
-- {"_get_id", &POA_IR::ComponentDef::_get_id_skel},
-- {"_set_id", &POA_IR::ComponentDef::_set_id_skel},
-- {"_get_emits_events", &POA_IR::ComponentDef::_get_emits_events_skel},
-- {"_get_def_kind", &POA_IR::ComponentDef::_get_def_kind_skel},
-- {"_get_name", &POA_IR::ComponentDef::_get_name_skel},
-- {"_get_type", &POA_IR::ComponentDef::_get_type_skel},
-- {"_set_name", &POA_IR::ComponentDef::_set_name_skel},
-- {"_get_uses_interfaces", &POA_IR::ComponentDef::_get_uses_interfaces_skel},
-- {"_set_base_interfaces", &POA_IR::ComponentDef::_set_base_interfaces_skel},
-- {"_get_base_interfaces", &POA_IR::ComponentDef::_get_base_interfaces_skel},
-- {"_get_consumes_events", &POA_IR::ComponentDef::_get_consumes_events_skel},
-- {"_get_publishes_events", &POA_IR::ComponentDef::_get_publishes_events_skel},
-- {"describe_contents", &POA_IR::ComponentDef::describe_contents_skel},
-- {"describe", &POA_IR::ComponentDef::describe_skel},
-- {"_get_provides_interfaces", &POA_IR::ComponentDef::_get_provides_interfaces_skel},
-- {"_get_supported_interfaces", &POA_IR::ComponentDef::_get_supported_interfaces_skel},
-- {"_set_supported_interfaces", &POA_IR::ComponentDef::_set_supported_interfaces_skel},
-- {"_get_version", &POA_IR::ComponentDef::_get_version_skel},
-- {"_set_version", &POA_IR::ComponentDef::_set_version_skel},
-- {"_get_absolute_name", &POA_IR::ComponentDef::_get_absolute_name_skel},
-- {"_get_defined_in", &POA_IR::ComponentDef::_get_defined_in_skel},
-- {"_non_existent", &POA_IR::ComponentDef::_non_existent_skel},
-- {"_get_is_abstract", &POA_IR::ComponentDef::_get_is_abstract_skel},
-- {"_set_is_abstract", &POA_IR::ComponentDef::_set_is_abstract_skel},
-- {"destroy", &POA_IR::ComponentDef::destroy_skel},
-- {"contents", &POA_IR::ComponentDef::contents_skel},
-- {"_get_base_component", &POA_IR::ComponentDef::_get_base_component_skel},
-- {"create_uses", &POA_IR::ComponentDef::create_uses_skel},
-- {"create_emits", &POA_IR::ComponentDef::create_emits_skel},
-- {"create_alias", &POA_IR::ComponentDef::create_alias_skel},
-- {"_get_is_basic", &POA_IR::ComponentDef::_get_is_basic_skel},
-- {"move", &POA_IR::ComponentDef::move_skel},
-- {"create_provides", &POA_IR::ComponentDef::create_provides_skel},
-- {"create_consumes", &POA_IR::ComponentDef::create_consumes_skel},
-- {"create_publishes", &POA_IR::ComponentDef::create_publishes_skel},
-- {"_get_containing_repository", &POA_IR::ComponentDef::_get_containing_repository_skel},
-- {"create_value", &POA_IR::ComponentDef::create_value_skel},
-- {"create_module", &POA_IR::ComponentDef::create_module_skel},
-- {"create_native", &POA_IR::ComponentDef::create_native_skel},
-- {"create_attribute", &POA_IR::ComponentDef::create_attribute_skel},
-- {"create_interface", &POA_IR::ComponentDef::create_interface_skel},
-- {"create_union", &POA_IR::ComponentDef::create_union_skel},
-- {"_get_is_local", &POA_IR::ComponentDef::_get_is_local_skel},
-- {"_set_is_local", &POA_IR::ComponentDef::_set_is_local_skel},
-- {"create_operation", &POA_IR::ComponentDef::create_operation_skel},
-- {"create_exception", &POA_IR::ComponentDef::create_exception_skel},
-- {"create_struct", &POA_IR::ComponentDef::create_struct_skel},
-- {"create_constant", &POA_IR::ComponentDef::create_constant_skel},
-- {"lookup_name", &POA_IR::ComponentDef::lookup_name_skel},
-- {"create_enum", &POA_IR::ComponentDef::create_enum_skel},
-- {"create_value_box", &POA_IR::ComponentDef::create_value_box_skel},
-- {"lookup", &POA_IR::ComponentDef::lookup_skel},
-+ {"move", &POA_IR::UsesDef::move_skel},
-+ {"_is_a", &POA_IR::UsesDef::_is_a_skel},
-+ {"_get_id", &POA_IR::UsesDef::_get_id_skel},
-+ {"_set_id", &POA_IR::UsesDef::_set_id_skel},
-+ {"describe", &POA_IR::UsesDef::describe_skel},
-+ {"_get_name", &POA_IR::UsesDef::_get_name_skel},
-+ {"_set_name", &POA_IR::UsesDef::_set_name_skel},
-+ {"_get_version", &POA_IR::UsesDef::_get_version_skel},
-+ {"_set_version", &POA_IR::UsesDef::_set_version_skel},
-+ {"_get_def_kind", &POA_IR::UsesDef::_get_def_kind_skel},
-+ {"_get_defined_in", &POA_IR::UsesDef::_get_defined_in_skel},
-+ {"_get_is_multiple", &POA_IR::UsesDef::_get_is_multiple_skel},
-+ {"destroy", &POA_IR::UsesDef::destroy_skel},
-+ {"_get_absolute_name", &POA_IR::UsesDef::_get_absolute_name_skel},
-+ {"_get_interface_type", &POA_IR::UsesDef::_get_interface_type_skel},
-+ {"_non_existent", &POA_IR::UsesDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::UsesDef::_get_containing_repository_skel},
- };
-
- static const signed char lookup[] =
- {
-- -1, -1, -6, -2, 4, 5, -10, -3, -13, -4, -21, -2, -91, -23,
-- -2, -28, -2, 8, 9, -94, -93, 17, 18, 19, 20, -96, -1, -95,
-- 25, -1, 26, -34, -2, 27, -38, -2, -102, 30, 31, 32, -1, 33,
-- -92, 36, 37, -92, 40, -43, -2, -45, -2, 41, 42, -87, -48, -2,
-- -88, 47, -85, -50, -2, -83, -1, 52, -1, 53, 54, -1, -1, -1,
-- -1, 55, -1, -1, -1, -1, 56, -1, -1, -1, -1, 57,
-+ -6, -2, -9, -2, 4, 5, -1, -43, 8, -43, -11, -2, -38, 13,
-+ -1, 14, 15, 16, 17, 18, -1, -1, -1, 19, -1, -1, -1, -1,
-+ -1, -1, -1, -1, -1, -1, -1, -1, 20,
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -39223,38 +18844,37 @@
+@@ -36481,10 +36342,9 @@
}
return 0;
}
--/* ending time is 16:31:13 */
--static TAO_IR_ComponentDef_Perfect_Hash_OpTable tao_IR_ComponentDef_optable;
--
+-/* ending time is 18:47:29 */
+/* ending time is 11:23:11 */
-+static TAO_IR_UsesDef_Perfect_Hash_OpTable tao_IR_UsesDef_optable;
+ static TAO_IR_UsesDef_Perfect_Hash_OpTable tao_IR_UsesDef_optable;
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Implementation
//
-
- // Factory function Implementation.
--POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker *POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::the_TAO_ComponentDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker *POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::the_TAO_UsesDef_Strategized_Proxy_Broker (void)
- {
-- static POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ static POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker strategized_proxy_broker;
- return &strategized_proxy_broker;
- }
-
--POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::_TAO_ComponentDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::_TAO_UsesDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- this->proxy_cache_[i] = 0;
-
- }
-
--POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::~_TAO_ComponentDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::~_TAO_UsesDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- delete this->proxy_cache_[i];
+@@ -36510,9 +36370,9 @@
}
--IR::_TAO_ComponentDef_Proxy_Impl&
--POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::ComponentDef *object,
+-IR::_TAO_UsesDef_Proxy_Impl&
+_TAO_UsesDef_Proxy_Impl&
-+POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::select_proxy (
+ POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::UsesDef *object,
+ IR_UsesDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -39272,7 +18892,7 @@
- }
-
- void
--POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::create_proxy (
-+POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::create_proxy (
- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -39286,7 +18906,7 @@
+@@ -36544,7 +36404,7 @@
case TAO_ORB_Core::THRU_POA_STRATEGY:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
-- POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl,
+- POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl,
+ _TAO_UsesDef_ThruPOA_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -39296,7 +18916,7 @@
+@@ -36554,7 +36414,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
-- ::IR::_TAO_ComponentDef_Remote_Proxy_Impl,
+- ::IR::_TAO_UsesDef_Remote_Proxy_Impl,
+ _TAO_UsesDef_Remote_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -39313,38 +18933,41 @@
+@@ -36571,26 +36431,26 @@
///////////////////////////////////////////////////////////////////////
--IR::_TAO_ComponentDef_Proxy_Broker *
--IR__TAO_ComponentDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+-IR::_TAO_UsesDef_Proxy_Broker *
+-IR__TAO_UsesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_UsesDef_Proxy_Broker *
+_TAO_UsesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::the_TAO_ComponentDef_Strategized_Proxy_Broker();
-+ return ::POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::the_TAO_UsesDef_Strategized_Proxy_Broker();
+ return ::POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::the_TAO_UsesDef_Strategized_Proxy_Broker();
}
int
--IR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+-IR__TAO_UsesDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_UsesDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
ACE_UNUSED_ARG (_dummy_);
-- IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_ComponentDef_Proxy_Broker_Factory_function;
+- IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_UsesDef_Proxy_Broker_Factory_function;
+ _TAO_UsesDef_Proxy_Broker_Factory_function_pointer =
+ _TAO_UsesDef_Proxy_Broker_Factory_function;
return 0;
}
--static int IR__TAO_ComponentDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer));
+-static int IR__TAO_UsesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_UsesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_UsesDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_UsesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+ _TAO_UsesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_UsesDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
- // ThruPOA Proxy Implementation
- //
-
--POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_TAO_ComponentDef_ThruPOA_Proxy_Impl (void)
-+POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_TAO_UsesDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::~_TAO_UsesDef_ThruPOA_Proxy_Impl (void)
- {}
+@@ -36602,7 +36462,7 @@
// ThruPOA Implementation of the IDL interface methods
--IR::InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
-+IR::InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type (
+-IR::InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type (
++IR_InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -39352,7 +18975,7 @@
+@@ -36610,7 +36470,7 @@
CORBA::SystemException
))
{
-- IR::InterfaceDefSeq_var _tao_retval;
+- IR::InterfaceDef_var _tao_retval;
+ IR_InterfaceDef_var _tao_retval;
ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -39360,402 +18983,489 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "supported_interfaces",
-+ "interface_type",
- forward_to.out (),
- ACE_TRY_ENV
- );
- ACE_CHECK_RETURN (0);
- return ACE_reinterpret_cast (
-- POA_IR::ComponentDef_ptr,
-+ POA_IR::UsesDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ComponentDef:1.0"
-+ "IDL:omg.org/IR/UsesDef:1.0"
- )
-- )->supported_interfaces (
-+ )->interface_type (
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+CORBA::Boolean POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::is_multiple (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+ CORBA::Boolean _tao_retval = 0;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "is_multiple",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (_tao_retval);
-+ return ACE_reinterpret_cast (
-+ POA_IR::UsesDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/UsesDef:1.0"
-+ )
-+ )->is_multiple (
- ACE_TRY_ENV
- );
- }
-
--void POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
-- CORBA_Object *_collocated_tao_target_,
-- const IR::InterfaceDefSeq & supported_interfaces,
-+//
-+// End ThruPOA Proxy Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-+// skeleton constructor
-+POA_IR::UsesDef::UsesDef (void)
-+{
-+ this->optable_ = &tao_IR_UsesDef_optable;
-+}
-+
-+// copy ctor
-+POA_IR::UsesDef::UsesDef (const UsesDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+@@ -36677,7 +36537,7 @@
+ // copy ctor
+ POA_IR::UsesDef::UsesDef (const UsesDef& rhs)
+ : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+ POA_CORBA_IRObject (rhs),
-+ TAO_ServantBase (rhs)
-+{}
-+
-+// skeleton destructor
-+POA_IR::UsesDef::~UsesDef (void)
-+{
-+}
-+
-+void POA_IR::UsesDef::_get_interface_type_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *)_tao_object_reference;
-+
+ TAO_ServantBase (rhs)
+ {}
+
+@@ -36695,7 +36555,7 @@
+ {
+ POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *)_tao_object_reference;
+
+- IR::InterfaceDef_var _tao_retval;
+ IR_InterfaceDef_var _tao_retval;
-+
-+ _tao_retval = _tao_impl->interface_type (
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+}
-+
-+void POA_IR::UsesDef::_get_is_multiple_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *)_tao_object_reference;
-+
-+ CORBA::Boolean _tao_retval = 0;
-+
-+ _tao_retval = _tao_impl->is_multiple (
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+}
-+
-+void POA_IR::UsesDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+{
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = 0;
-+ CORBA::String_var value;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -36722,7 +36582,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -36856,7 +36716,7 @@
+ POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *) _tao_object_reference;
+ CORBA::Boolean _tao_retval = 0;
+ CORBA::String_var value;
+- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
-+ ACE_THROW (CORBA::MARSHAL ());
-+
-+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
-+}
-+
-+void POA_IR::UsesDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
- {
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "supported_interfaces",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
-- ACE_reinterpret_cast (
-- POA_IR::ComponentDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ComponentDef:1.0"
-- )
-- )->supported_interfaces (
-- supported_interfaces,
-- ACE_TRY_ENV
-- );
-- return;
-+ POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+ ACE_THROW (CORBA::MARSHAL ());
+
+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+@@ -36864,7 +36724,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (CORBA::MARSHAL ());
}
--IR::ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_component (
-- CORBA_Object *_collocated_tao_target_,
-+CORBA::Boolean POA_IR::UsesDef::_is_a (
-+ const char* value,
- CORBA::Environment &ACE_TRY_ENV
- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
- {
-- IR::ComponentDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "base_component",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ComponentDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ComponentDef:1.0"
-- )
-- )->base_component (
-- 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-+ return 1;
-+ else
-+ return 0;
+@@ -36881,7 +36741,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
++ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
+ ACE_THROW (CORBA::MARSHAL ());
}
--IR::ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_interfaces (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-+void* POA_IR::UsesDef::_downcast (
-+ const char* logical_type_id
- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
- {
-- IR::ProvidesDefSeq_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "provides_interfaces",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ComponentDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ComponentDef:1.0"
-- )
-- )->provides_interfaces (
-- ACE_TRY_ENV
-- );
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/UsesDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::UsesDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Contained_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+@@ -36909,7 +36769,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
+ return ACE_static_cast (POA_IR::Contained_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-+ return ACE_static_cast(PortableServer::Servant, this);
-+ return 0;
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+ return ACE_static_cast(PortableServer::Servant, this);
+ return 0;
+@@ -36939,10 +36799,9 @@
+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
+
+ CORBA::Object_var obj = tmp;
+- return ::IR::UsesDef::_unchecked_narrow (obj.in ());
++ return IR_UsesDef::_unchecked_narrow (obj.in ());
}
--IR::UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+void POA_IR::UsesDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
-- IR::UsesDefSeq_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "uses_interfaces",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ComponentDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ComponentDef:1.0"
-- )
-- )->uses_interfaces (
-- ACE_TRY_ENV
-- );
-+ this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
-+}
-+
-+const char* POA_IR::UsesDef::_interface_repository_id (void) const
-+{
-+ return "IDL:omg.org/IR/UsesDef:1.0";
-+}
-+
-+IR::UsesDef*
-+POA_IR::UsesDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+{
-+ TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (0);
-+
-+ CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-+
-+ if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-+ else
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-+
-+ CORBA::Object_var obj = tmp;
-+ return IR_UsesDef::_unchecked_narrow (obj.in ());
-+}
-+
-+class TAO_IR_EventDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+{
-+private:
-+ unsigned int hash (const char *str, unsigned int len);
-+public:
-+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-+};
-+/* starting time is 11:23:11 */
-+/* C++ code produced by gperf version 2.8 (ACE version) */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EventDef_Perfect_Hash_OpTable -N lookup */
-+unsigned int
-+TAO_IR_EventDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+{
-+ static const unsigned char asso_values[] =
-+ {
-+#if defined (ACE_MVS)
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 0, 0, 37, 37, 37, 10, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37,
-+#else
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-+ 0, 0, 37, 37, 37, 10, 37, 37, 37, 0,
-+ 0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
-+ 37, 10, 37, 37, 37, 37, 37, 37,
-+#endif /* ACE_MVS */
-+ };
-+ return len + asso_values[str[len - 1]] + asso_values[str[0]];
-+}
-+
-+const class TAO_operation_db_entry *
-+TAO_IR_EventDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+{
-+ enum
-+ {
-+ TOTAL_KEYWORDS = 17,
-+ MIN_WORD_LENGTH = 4,
-+ MAX_WORD_LENGTH = 26,
-+ MIN_HASH_VALUE = 4,
-+ MAX_HASH_VALUE = 36,
-+ HASH_VALUE_RANGE = 33,
-+ DUPLICATES = 4
-+ };
-+
-+ static const class TAO_operation_db_entry wordlist[] =
-+ {
-+ {"",0},{"",0},{"",0},{"",0},
-+ {"move", &POA_IR::EventDef::move_skel},
-+ {"_is_a", &POA_IR::EventDef::_is_a_skel},
-+ {"_get_id", &POA_IR::EventDef::_get_id_skel},
-+ {"_set_id", &POA_IR::EventDef::_set_id_skel},
-+ {"describe", &POA_IR::EventDef::describe_skel},
-+ {"_get_name", &POA_IR::EventDef::_get_name_skel},
-+ {"_set_name", &POA_IR::EventDef::_set_name_skel},
-+ {"_get_version", &POA_IR::EventDef::_get_version_skel},
-+ {"_set_version", &POA_IR::EventDef::_set_version_skel},
-+ {"_get_def_kind", &POA_IR::EventDef::_get_def_kind_skel},
-+ {"is_a", &POA_IR::EventDef::is_a_skel},
-+ {"_get_defined_in", &POA_IR::EventDef::_get_defined_in_skel},
-+ {"destroy", &POA_IR::EventDef::destroy_skel},
-+ {"_get_absolute_name", &POA_IR::EventDef::_get_absolute_name_skel},
-+ {"_get_event", &POA_IR::EventDef::_get_event_skel},
-+ {"_non_existent", &POA_IR::EventDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::EventDef::_get_containing_repository_skel},
-+ };
-+
-+ static const signed char lookup[] =
-+ {
-+ -6, -2, -9, -2, 4, 5, -1, -43, 8, -43, -11, -2, -38, 13,
-+ 14, 15, -1, 16, 17, -1, 18, -1, -1, 19, -1, -1, -1, -1,
-+ -1, -1, -1, -1, -1, -1, -1, -1, 20,
-+ };
-+
-+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-+ {
-+ unsigned int key = hash (str, len);
-+
-+ if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-+ {
-+ int slot = lookup[key];
-+
-+ if (slot >= 0 && slot < MAX_HASH_VALUE)
-+ {
-+ const char *s = wordlist[slot].opname_;
-+
-+ if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-+ return &wordlist[slot];
-+ }
-+ else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-+ return 0;
-+ else
-+ {
-+ unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-+ const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-+ const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
-+
-+ while (--ptr >= base)
-+ if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-+ return ptr;
-+ }
-+ }
-+ }
-+ return 0;
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -37095,6 +36954,7 @@
}
-+/* ending time is 11:23:11 */
-+static TAO_IR_EventDef_Perfect_Hash_OpTable tao_IR_EventDef_optable;
--IR::EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Implementation
-+//
+ #endif /* TAO_HAS_INTERCEPTORS */
+
-+// Factory function Implementation.
-+POA_IR::_TAO_EventDef_Strategized_Proxy_Broker *POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::the_TAO_EventDef_Strategized_Proxy_Broker (void)
+ class TAO_IR_EventDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
-- IR::EmitsDefSeq_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "emits_events",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ComponentDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ComponentDef:1.0"
-- )
-- )->emits_events (
-- ACE_TRY_ENV
-- );
-+ static POA_IR::_TAO_EventDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ return &strategized_proxy_broker;
+ private:
+@@ -37102,7 +36962,7 @@
+ public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 18:47:29 */
++/* starting time is 11:23:11 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EventDef_Perfect_Hash_OpTable -N lookup */
+ unsigned int
+@@ -37230,10 +37090,9 @@
+ }
+ return 0;
}
+-/* ending time is 18:47:29 */
++/* ending time is 11:23:11 */
+ static TAO_IR_EventDef_Perfect_Hash_OpTable tao_IR_EventDef_optable;
--IR::PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_events (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::_TAO_EventDef_Strategized_Proxy_Broker (void)
- {
-- IR::PublishesDefSeq_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "publishes_events",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ComponentDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ComponentDef:1.0"
-- )
-- )->publishes_events (
-- ACE_TRY_ENV
-- );
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ this->proxy_cache_[i] = 0;
-+
+-
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Implementation
+ //
+@@ -37259,9 +37118,9 @@
+
}
--IR::ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_events (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::~_TAO_EventDef_Strategized_Proxy_Broker (void)
- {
-- IR::ConsumesDefSeq_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "consumes_events",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ComponentDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ComponentDef:1.0"
-- )
-- )->consumes_events (
-- ACE_TRY_ENV
-- );
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ delete this->proxy_cache_[i];
-+
- }
-
--CORBA::Boolean POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::is_basic (
-- CORBA_Object *_collocated_tao_target_,
+-IR::_TAO_EventDef_Proxy_Impl&
+_TAO_EventDef_Proxy_Impl&
-+POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::select_proxy (
+ POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::EventDef *object,
+ IR_EventDef *object,
CORBA::Environment &ACE_TRY_ENV
)
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
- {
-- CORBA::Boolean _tao_retval = 0;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "is_basic",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
-- return ACE_reinterpret_cast (
-- POA_IR::ComponentDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ComponentDef:1.0"
-- )
-- )->is_basic (
-- ACE_TRY_ENV
-- );
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-+ TAO_ORB_Core::collocation_strategy (object);
-+
-+ if (this->proxy_cache_[strategy] != 0)
-+ return *this->proxy_cache_[strategy];
-+
-+ this->create_proxy (strategy, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-+
-+ return *this->proxy_cache_[strategy];
-+
- }
-
--IR::ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provides (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
-- IR::InterfaceDef_ptr interface_type,
-+void
-+POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::create_proxy (
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
{
-- IR::ProvidesDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_provides",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ComponentDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ComponentDef:1.0"
-- )
-- )->create_provides (
-- id,
-- name,
-- version,
-- interface_type,
-- ACE_TRY_ENV
-- );
-+ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-+
-+ if (this->proxy_cache_[strategy] == 0)
-+ {
-+ switch (strategy)
-+ {
-+ case TAO_ORB_Core::THRU_POA_STRATEGY:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+@@ -37293,7 +37152,7 @@
+ case TAO_ORB_Core::THRU_POA_STRATEGY:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl,
+ _TAO_EventDef_ThruPOA_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ case TAO_ORB_Core::REMOTE_STRATEGY:
-+ default:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -37303,7 +37162,7 @@
+ default:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- ::IR::_TAO_EventDef_Remote_Proxy_Impl,
+ _TAO_EventDef_Remote_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ }
-+
-+ }
- }
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -37320,26 +37179,26 @@
+ ///////////////////////////////////////////////////////////////////////
--IR::UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::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
-- ))
--{
-- IR::UsesDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_uses",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ComponentDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ComponentDef:1.0"
-- )
-- )->create_uses (
-- id,
-- name,
-- version,
-- interface_type,
-- is_multiple,
-- ACE_TRY_ENV
-- );
-+
-+//
-+// End Strategized Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-+
+
+-IR::_TAO_EventDef_Proxy_Broker *
+-IR__TAO_EventDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_EventDef_Proxy_Broker *
+_TAO_EventDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+{
-+ ACE_UNUSED_ARG (obj);
-+ return ::POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::the_TAO_EventDef_Strategized_Proxy_Broker();
+ {
+ ACE_UNUSED_ARG (obj);
+ return ::POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::the_TAO_EventDef_Strategized_Proxy_Broker();
}
--IR::EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::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
-- ))
-+int
+ int
+-IR__TAO_EventDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_EventDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
-- IR::EmitsDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_emits",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::ComponentDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ComponentDef:1.0"
-- )
-- )->create_emits (
-- id,
-- name,
-- version,
-- value,
-- ACE_TRY_ENV
-- );
-+ ACE_UNUSED_ARG (_dummy_);
-+
+ ACE_UNUSED_ARG (_dummy_);
+
+- IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_EventDef_Proxy_Broker_Factory_function;
+ _TAO_EventDef_Proxy_Broker_Factory_function_pointer =
+ _TAO_EventDef_Proxy_Broker_Factory_function;
-+
-+ return 0;
+
+ return 0;
}
--IR::PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publishes (
+-static int IR__TAO_EventDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_EventDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_EventDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_EventDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+ _TAO_EventDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_EventDef_Proxy_Broker_Factory_Initializer));
-+
-+
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Proxy Implementation
-+//
-+
-+POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::_TAO_EventDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::~_TAO_EventDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+// ThruPOA Implementation of the IDL interface methods
-+
-+CORBA::Boolean POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::is_a (
- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
-- IR::ValueDef_ptr value,
-+ const char * event_id,
- CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ))
- {
-- IR::PublishesDef_var _tao_retval;
-+ CORBA::Boolean _tao_retval = 0;
- ACE_UNUSED_ARG (_tao_retval);
- TAO_Object_Adapter::Servant_Upcall servant_upcall (
- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -39763,38 +19473,31 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "create_publishes",
-+ "is_a",
- forward_to.out (),
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (0);
-+ ACE_CHECK_RETURN (_tao_retval);
- return ACE_reinterpret_cast (
-- POA_IR::ComponentDef_ptr,
-+ POA_IR::EventDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ComponentDef:1.0"
-+ "IDL:omg.org/IR/EventDef:1.0"
- )
-- )->create_publishes (
-- id,
-- name,
-- version,
-- value,
-+ )->is_a (
-+ event_id,
- ACE_TRY_ENV
+
+
+ ///////////////////////////////////////////////////////////////////////
+@@ -37384,7 +37243,7 @@
);
}
--IR::ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consumes (
-+IR::ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event (
+-IR::ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event (
++IR_ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event (
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 ((
+@@ -37392,7 +37251,7 @@
CORBA::SystemException
))
{
-- IR::ConsumesDef_var _tao_retval;
+- IR::ValueDef_var _tao_retval;
+ IR_ValueDef_var _tao_retval;
ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -39802,21 +19505,17 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "create_consumes",
-+ "event",
- forward_to.out (),
- ACE_TRY_ENV
- );
- ACE_CHECK_RETURN (0);
- return ACE_reinterpret_cast (
-- POA_IR::ComponentDef_ptr,
-+ POA_IR::EventDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/ComponentDef:1.0"
-+ "IDL:omg.org/IR/EventDef:1.0"
- )
-- )->create_consumes (
-- id,
-- name,
-- version,
-- value,
-+ )->event (
- ACE_TRY_ENV
- );
- }
-@@ -39826,1291 +19525,507 @@
- ///////////////////////////////////////////////////////////////////////
-
- // skeleton constructor
--POA_IR::ComponentDef::ComponentDef (void)
--{
-- this->optable_ = &tao_IR_ComponentDef_optable;
--}
--
--// copy ctor
--POA_IR::ComponentDef::ComponentDef (const ComponentDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,InterfaceDef) (rhs),
-- ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-- ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-- ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+@@ -37428,7 +37287,7 @@
+ // copy ctor
+ POA_IR::EventDef::EventDef (const EventDef& rhs)
+ : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-- TAO_ServantBase (rhs)
--{}
--
--// skeleton destructor
--POA_IR::ComponentDef::~ComponentDef (void)
--{
--}
--
--void POA_IR::ComponentDef::_get_supported_interfaces_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
--
-- IR::InterfaceDefSeq_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->supported_interfaces (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::ComponentDef::_set_supported_interfaces_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
--
--_tao_server_request.argument_flag (0);
-- IR::InterfaceDefSeq supported_interfaces;
-- if (!(
-- (_tao_in >> supported_interfaces)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- supported_interfaces,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--
-- _tao_impl->supported_interfaces (
-- supported_interfaces,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
--}
--
--void POA_IR::ComponentDef::_get_base_component_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
--
-- IR::ComponentDef_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->base_component (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ComponentDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::ComponentDef::_get_provides_interfaces_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
--
-- IR::ProvidesDefSeq_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->provides_interfaces (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ProvidesDefSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--}
--
--void POA_IR::ComponentDef::_get_uses_interfaces_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
--
-- IR::UsesDefSeq_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->uses_interfaces (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::UsesDefSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+POA_IR::EventDef::EventDef (void)
-+{
-+ this->optable_ = &tao_IR_EventDef_optable;
-+}
-+
-+// copy ctor
-+POA_IR::EventDef::EventDef (const EventDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ POA_CORBA_IRObject (rhs),
-+ TAO_ServantBase (rhs)
-+{}
-
-+// skeleton destructor
-+POA_IR::EventDef::~EventDef (void)
-+{
- }
+ TAO_ServantBase (rhs)
+ {}
--void POA_IR::ComponentDef::_get_emits_events_skel (
-+void POA_IR::EventDef::is_a_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *)_tao_object_reference;
-
-- IR::EmitsDefSeq_var _tao_retval;
-+ CORBA::Boolean _tao_retval = 0;
-+ CORBA::String_var event_id;
-+ if (!(
-+ (_tao_in >> event_id.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->is_a (
-+ event_id.in (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->emits_events (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::EmitsDefSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
-- (_tao_out << _tao_retval.in ())
-+ (_tao_out << CORBA::Any::from_boolean (_tao_retval))
+@@ -37454,7 +37313,6 @@
))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
+ ACE_THROW (CORBA::MARSHAL());
--void POA_IR::ComponentDef::_get_publishes_events_skel (
-+void POA_IR::EventDef::_get_event_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -37534,7 +37392,7 @@
{
-- POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-+ POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *)_tao_object_reference;
-
-- IR::PublishesDefSeq_var _tao_retval;
+ POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *)_tao_object_reference;
+
+- IR::ValueDef_var _tao_retval;
+ IR_ValueDef_var _tao_retval;
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-+ _tao_retval = _tao_impl->event (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->publishes_events (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::PublishesDefSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
- (_tao_out << _tao_retval.in ())
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void POA_IR::ComponentDef::_get_consumes_events_skel (
-+void POA_IR::EventDef::_is_a_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void * _tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
--
-- IR::ConsumesDefSeq_var _tao_retval;
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = 0;
-+ CORBA::String_var value;
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -37561,7 +37419,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -37616,7 +37474,7 @@
+ POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *) _tao_object_reference;
+ CORBA::Boolean _tao_retval = 0;
+ CORBA::String_var value;
+- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
-+ ACE_THROW (CORBA::MARSHAL ());
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->consumes_events (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ConsumesDefSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+ ACE_THROW (CORBA::MARSHAL ());
+
+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+@@ -37624,7 +37482,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::ComponentDef::_get_is_basic_skel (
-+void POA_IR::EventDef::_non_existent_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void * _tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
--
-- CORBA::Boolean _tao_retval = 0;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->is_basic (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::Boolean _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+ POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+@@ -37641,7 +37499,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::ComponentDef::create_provides_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+CORBA::Boolean POA_IR::EventDef::_is_a (
-+ const char* value,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-+ 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-+ return 1;
-+ else
-+ return 0;
-+}
-
-- IR::ProvidesDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
-- IR::InterfaceDef_var interface_type;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> interface_type.out ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+void* POA_IR::EventDef::_downcast (
-+ const char* logical_type_id
-+ )
-+{
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/EventDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::EventDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Contained_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+@@ -37669,7 +37527,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
+ return ACE_static_cast (POA_IR::Contained_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-+ return ACE_static_cast(PortableServer::Servant, this);
-+ return 0;
-+}
-
-+void POA_IR::EventDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+{
-+ this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
-+}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
-+const char* POA_IR::EventDef::_interface_repository_id (void) const
-+{
-+ return "IDL:omg.org/IR/EventDef:1.0";
-+}
-+
-+IR::EventDef*
-+POA_IR::EventDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+{
-+ TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (0);
-
-- POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- interface_type.in (),
-- ACE_TRY_ENV
-- );
-+ CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
-- ACE_TRY
-+ if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-+ else
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-+
-+ CORBA::Object_var obj = tmp;
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+ return ACE_static_cast(PortableServer::Servant, this);
+ return 0;
+@@ -37699,10 +37557,9 @@
+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
+
+ CORBA::Object_var obj = tmp;
+- return ::IR::EventDef::_unchecked_narrow (obj.in ());
+ return IR_EventDef::_unchecked_narrow (obj.in ());
-+}
-+
-+class TAO_IR_EmitsDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+{
-+private:
-+ unsigned int hash (const char *str, unsigned int len);
-+public:
-+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-+};
-+/* starting time is 11:23:11 */
-+/* C++ code produced by gperf version 2.8 (ACE version) */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EmitsDef_Perfect_Hash_OpTable -N lookup */
-+unsigned int
-+TAO_IR_EmitsDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+{
-+ static const unsigned char asso_values[] =
- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_provides (
-- id.in (),
-- name.in (),
-- version.in (),
-- interface_type.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ProvidesDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-+#if defined (ACE_MVS)
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 0, 0, 37, 37, 37, 10, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37,
-+#else
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-+ 0, 0, 37, 37, 37, 10, 37, 37, 37, 0,
-+ 0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
-+ 37, 10, 37, 37, 37, 37, 37, 37,
-+#endif /* ACE_MVS */
-+ };
-+ return len + asso_values[str[len - 1]] + asso_values[str[0]];
-+}
-+
-+const class TAO_operation_db_entry *
-+TAO_IR_EmitsDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+{
-+ enum
-+ {
-+ TOTAL_KEYWORDS = 17,
-+ MIN_WORD_LENGTH = 4,
-+ MAX_WORD_LENGTH = 26,
-+ MIN_HASH_VALUE = 4,
-+ MAX_HASH_VALUE = 36,
-+ HASH_VALUE_RANGE = 33,
-+ DUPLICATES = 4
-+ };
-+
-+ static const class TAO_operation_db_entry wordlist[] =
- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-+ {"",0},{"",0},{"",0},{"",0},
-+ {"move", &POA_IR::EmitsDef::move_skel},
-+ {"_is_a", &POA_IR::EmitsDef::_is_a_skel},
-+ {"_get_id", &POA_IR::EmitsDef::_get_id_skel},
-+ {"_set_id", &POA_IR::EmitsDef::_set_id_skel},
-+ {"describe", &POA_IR::EmitsDef::describe_skel},
-+ {"_get_name", &POA_IR::EmitsDef::_get_name_skel},
-+ {"_set_name", &POA_IR::EmitsDef::_set_name_skel},
-+ {"_get_version", &POA_IR::EmitsDef::_get_version_skel},
-+ {"_set_version", &POA_IR::EmitsDef::_set_version_skel},
-+ {"_get_def_kind", &POA_IR::EmitsDef::_get_def_kind_skel},
-+ {"is_a", &POA_IR::EmitsDef::is_a_skel},
-+ {"_get_defined_in", &POA_IR::EmitsDef::_get_defined_in_skel},
-+ {"destroy", &POA_IR::EmitsDef::destroy_skel},
-+ {"_get_absolute_name", &POA_IR::EmitsDef::_get_absolute_name_skel},
-+ {"_get_event", &POA_IR::EmitsDef::_get_event_skel},
-+ {"_non_existent", &POA_IR::EmitsDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::EmitsDef::_get_containing_repository_skel},
-+ };
-+
-+ static const signed char lookup[] =
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+ -6, -2, -9, -2, 4, 5, -1, -43, 8, -43, -11, -2, -38, 13,
-+ 14, 15, -1, 16, 17, -1, 18, -1, -1, 19, -1, -1, -1, -1,
-+ -1, -1, -1, -1, -1, -1, -1, -1, 20,
-+ };
+ }
--}
-+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-+ {
-+ unsigned int key = hash (str, len);
-
--void POA_IR::ComponentDef::create_uses_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-+ if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-+ {
-+ int slot = lookup[key];
-
-- IR::UsesDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
-- IR::InterfaceDef_var interface_type;
-- CORBA::Boolean is_multiple;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> interface_type.out ()) &&
-- (_tao_in >> CORBA::Any::to_boolean (is_multiple))
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+ if (slot >= 0 && slot < MAX_HASH_VALUE)
-+ {
-+ const char *s = wordlist[slot].opname_;
-
-+ if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-+ return &wordlist[slot];
-+ }
-+ else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-+ return 0;
-+ else
-+ {
-+ unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-+ const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-+ const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- interface_type.in (),
-- is_multiple,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
-
-- _tao_impl->create_uses (
-- id.in (),
-- name.in (),
-- version.in (),
-- interface_type.in (),
-- is_multiple,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::UsesDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ while (--ptr >= base)
-+ if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-+ return ptr;
-+ }
-+ }
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::TAO_ServerRequestInfo_IR_EventDef_is_a (
+ TAO_ServerRequest &_tao_server_request,
+@@ -37864,6 +37721,7 @@
+ }
+
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_EmitsDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+ {
+ private:
+@@ -37871,7 +37729,7 @@
+ public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 18:47:29 */
++/* starting time is 11:23:11 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EmitsDef_Perfect_Hash_OpTable -N lookup */
+ unsigned int
+@@ -37999,10 +37857,9 @@
}
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ return 0;
+ return 0;
}
+-/* ending time is 18:47:29 */
+/* ending time is 11:23:11 */
-+static TAO_IR_EmitsDef_Perfect_Hash_OpTable tao_IR_EmitsDef_optable;
-
--void POA_IR::ComponentDef::create_emits_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
--
-- IR::EmitsDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
-- IR::ValueDef_var value;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> value.out ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Implementation
-+//
-
-+// Factory function Implementation.
-+POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker *POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::the_TAO_EmitsDef_Strategized_Proxy_Broker (void)
-+{
-+ static POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ return &strategized_proxy_broker;
-+}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- value.in (),
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_emits (
-- id.in (),
-- name.in (),
-- version.in (),
-- value.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::EmitsDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
-+POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::_TAO_EmitsDef_Strategized_Proxy_Broker (void)
-+{
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ this->proxy_cache_[i] = 0;
-
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+}
-
-+POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::~_TAO_EmitsDef_Strategized_Proxy_Broker (void)
-+{
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ delete this->proxy_cache_[i];
-+
- }
-
--void POA_IR::ComponentDef::create_publishes_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+_TAO_EmitsDef_Proxy_Impl&
-+POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::select_proxy (
-+ IR_EmitsDef *object,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
--
-- IR::PublishesDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
-- IR::ValueDef_var value;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> value.out ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-+ TAO_ORB_Core::collocation_strategy (object);
-
-- POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- value.in (),
-- ACE_TRY_ENV
-- );
-+ if (this->proxy_cache_[strategy] != 0)
-+ return *this->proxy_cache_[strategy];
-
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_publishes (
-- id.in (),
-- name.in (),
-- version.in (),
-- value.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::PublishesDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
-+ this->create_proxy (strategy, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-+
-+ return *this->proxy_cache_[strategy];
-
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
+ static TAO_IR_EmitsDef_Perfect_Hash_OpTable tao_IR_EmitsDef_optable;
+
-
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Implementation
+ //
+@@ -38028,9 +37885,9 @@
+
}
--void POA_IR::ComponentDef::create_consumes_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+void
-+POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::create_proxy (
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy,
+-IR::_TAO_EmitsDef_Proxy_Impl&
++_TAO_EmitsDef_Proxy_Impl&
+ POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::EmitsDef *object,
++ IR_EmitsDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-+ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-+
-+ if (this->proxy_cache_[strategy] == 0)
-+ {
-+ switch (strategy)
-+ {
-+ case TAO_ORB_Core::THRU_POA_STRATEGY:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+@@ -38062,7 +37919,7 @@
+ case TAO_ORB_Core::THRU_POA_STRATEGY:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- POA_IR::_TAO_EmitsDef_ThruPOA_Proxy_Impl,
+ _TAO_EmitsDef_ThruPOA_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ case TAO_ORB_Core::REMOTE_STRATEGY:
-+ default:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -38072,7 +37929,7 @@
+ default:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- ::IR::_TAO_EmitsDef_Remote_Proxy_Impl,
+ _TAO_EmitsDef_Remote_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ }
-+
-+ }
-+}
-
-- IR::ConsumesDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
-- IR::ValueDef_var value;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> value.out ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-
-+//
-+// End Strategized Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- value.in (),
-- ACE_TRY_ENV
-- );
-+
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -38089,26 +37946,26 @@
+ ///////////////////////////////////////////////////////////////////////
+
+
+-IR::_TAO_EmitsDef_Proxy_Broker *
+-IR__TAO_EmitsDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_EmitsDef_Proxy_Broker *
+_TAO_EmitsDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+{
-+ ACE_UNUSED_ARG (obj);
-+ return ::POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::the_TAO_EmitsDef_Strategized_Proxy_Broker();
-+}
-+
-+int
+ {
+ ACE_UNUSED_ARG (obj);
+ return ::POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::the_TAO_EmitsDef_Strategized_Proxy_Broker();
+ }
+
+ int
+-IR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_EmitsDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+{
-+ ACE_UNUSED_ARG (_dummy_);
-
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_consumes (
-- id.in (),
-- name.in (),
-- version.in (),
-- value.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ConsumesDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
+ {
+ ACE_UNUSED_ARG (_dummy_);
+
+- IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_EmitsDef_Proxy_Broker_Factory_function;
+ _TAO_EmitsDef_Proxy_Broker_Factory_function_pointer =
+ _TAO_EmitsDef_Proxy_Broker_Factory_function;
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+ return 0;
-+}
-+
+ return 0;
+ }
+
+-static int IR__TAO_EmitsDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_EmitsDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+ _TAO_EmitsDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_EmitsDef_Proxy_Broker_Factory_Initializer));
-+
-+
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Proxy Implementation
-+//
-+
-+POA_IR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::_TAO_EmitsDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::~_TAO_EmitsDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+// ThruPOA Implementation of the IDL interface methods
-+
-+//
-+// End ThruPOA Proxy Implementation
-+///////////////////////////////////////////////////////////////////////
-
-+// skeleton constructor
-+POA_IR::EmitsDef::EmitsDef (void)
-+{
-+ this->optable_ = &tao_IR_EmitsDef_optable;
- }
-
--void POA_IR::ComponentDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-+// copy ctor
-+POA_IR::EmitsDef::EmitsDef (const EmitsDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,EventDef) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+
+
+ ///////////////////////////////////////////////////////////////////////
+@@ -38134,7 +37991,7 @@
+ POA_IR::EmitsDef::EmitsDef (const EmitsDef& rhs)
+ : ACE_NESTED_CLASS (POA_IR,EventDef) (rhs),
+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+ POA_CORBA_IRObject (rhs),
-+ TAO_ServantBase (rhs)
-+{}
-+
-+// skeleton destructor
-+POA_IR::EmitsDef::~EmitsDef (void)
-+{
-+}
-+
-+void POA_IR::EmitsDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *) _tao_object_reference;
-+ POA_IR::EmitsDef *_tao_impl = (POA_IR::EmitsDef *) _tao_object_reference;
+ TAO_ServantBase (rhs)
+ {}
+
+@@ -38154,7 +38011,7 @@
+ POA_IR::EmitsDef *_tao_impl = (POA_IR::EmitsDef *) _tao_object_reference;
CORBA::Boolean _tao_retval = 0;
CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
ACE_THROW (CORBA::MARSHAL ());
--
-+
+
_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -38162,7 +38019,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -50413,21 +8875,8 @@
ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::ComponentDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::EmitsDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *) _tao_object_reference;
-+ POA_IR::EmitsDef *_tao_impl = (POA_IR::EmitsDef *) _tao_object_reference;
- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -38179,7 +38036,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -50435,2744 +8884,621 @@
ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Boolean POA_IR::ComponentDef::_is_a (
-+CORBA::Boolean POA_IR::EmitsDef::_is_a (
- const 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/EmitsDef:1.0")) ||
-+ (!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/IR/IDLType:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
- return 1;
-@@ -41118,39 +20033,35 @@
- return 0;
- }
-
--void* POA_IR::ComponentDef::_downcast (
-+void* POA_IR::EmitsDef::_downcast (
- const char* logical_type_id
- )
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ComponentDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::ComponentDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/InterfaceDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::InterfaceDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-- return ACE_static_cast (POA_IR::Container_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/EmitsDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::EmitsDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/EventDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::EventDef_ptr, this);
+@@ -38210,7 +38067,7 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
return ACE_static_cast (POA_IR::Contained_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-- return ACE_static_cast (POA_IR::IDLType_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
- }
-
--void POA_IR::ComponentDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::EmitsDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--const char* POA_IR::ComponentDef::_interface_repository_id (void) const
-+const char* POA_IR::EmitsDef::_interface_repository_id (void) const
- {
-- return "IDL:omg.org/IR/ComponentDef:1.0";
-+ return "IDL:omg.org/IR/EmitsDef:1.0";
- }
-
--IR::ComponentDef*
--POA_IR::ComponentDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+IR::EmitsDef*
-+POA_IR::EmitsDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-@@ -41163,1339 +20074,913 @@
+@@ -38240,12 +38097,12 @@
ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
CORBA::Object_var obj = tmp;
-- return ::IR::ComponentDef::_unchecked_narrow (obj.in ());
--}
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (IR::InterfaceDefSeq * result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- const IR::InterfaceDefSeq & supported_interfaces,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- supported_interfaces_ (supported_interfaces)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_supported_interfaces = parameter_list->length ();
-- parameter_list->length (length_supported_interfaces + 1);
-- (*parameter_list)[length_supported_interfaces].argument <<= this->supported_interfaces_;
--
-- (*parameter_list)[length_supported_interfaces].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--CORBA::Any *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--char *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
+- return ::IR::EmitsDef::_unchecked_narrow (obj.in ());
+ return IR_EmitsDef::_unchecked_narrow (obj.in ());
}
--CORBA::Any *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+class TAO_IR_PublishesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-
--char *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+private:
-+ unsigned int hash (const char *str, unsigned int len);
-+public:
-+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-+};
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_PublishesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+ {
+ private:
+@@ -38253,7 +38110,7 @@
+ public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 18:47:29 */
+/* starting time is 11:23:11 */
-+/* C++ code produced by gperf version 2.8 (ACE version) */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PublishesDef_Perfect_Hash_OpTable -N lookup */
-+unsigned int
-+TAO_IR_PublishesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ static const unsigned char asso_values[] =
-+ {
-+#if defined (ACE_MVS)
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 0, 0, 37, 37, 37, 10, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37,
-+#else
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-+ 0, 0, 37, 37, 37, 10, 37, 37, 37, 0,
-+ 0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
-+ 37, 10, 37, 37, 37, 37, 37, 37,
-+#endif /* ACE_MVS */
-+ };
-+ return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
--CORBA::Boolean
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+const class TAO_operation_db_entry *
-+TAO_IR_PublishesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+ enum
-+ {
-+ TOTAL_KEYWORDS = 17,
-+ MIN_WORD_LENGTH = 4,
-+ MAX_WORD_LENGTH = 26,
-+ MIN_HASH_VALUE = 4,
-+ MAX_HASH_VALUE = 36,
-+ HASH_VALUE_RANGE = 33,
-+ DUPLICATES = 4
-+ };
-
--void
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (IR::ComponentDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
-+ static const class TAO_operation_db_entry wordlist[] =
-+ {
-+ {"",0},{"",0},{"",0},{"",0},
-+ {"move", &POA_IR::PublishesDef::move_skel},
-+ {"_is_a", &POA_IR::PublishesDef::_is_a_skel},
-+ {"_get_id", &POA_IR::PublishesDef::_get_id_skel},
-+ {"_set_id", &POA_IR::PublishesDef::_set_id_skel},
-+ {"describe", &POA_IR::PublishesDef::describe_skel},
-+ {"_get_name", &POA_IR::PublishesDef::_get_name_skel},
-+ {"_set_name", &POA_IR::PublishesDef::_set_name_skel},
-+ {"_get_version", &POA_IR::PublishesDef::_get_version_skel},
-+ {"_set_version", &POA_IR::PublishesDef::_set_version_skel},
-+ {"_get_def_kind", &POA_IR::PublishesDef::_get_def_kind_skel},
-+ {"is_a", &POA_IR::PublishesDef::is_a_skel},
-+ {"_get_defined_in", &POA_IR::PublishesDef::_get_defined_in_skel},
-+ {"destroy", &POA_IR::PublishesDef::destroy_skel},
-+ {"_get_absolute_name", &POA_IR::PublishesDef::_get_absolute_name_skel},
-+ {"_get_event", &POA_IR::PublishesDef::_get_event_skel},
-+ {"_non_existent", &POA_IR::PublishesDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::PublishesDef::_get_containing_repository_skel},
-+ };
-
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
-+ static const signed char lookup[] =
-+ {
-+ -6, -2, -9, -2, 4, 5, -1, -43, 8, -43, -11, -2, -38, 13,
-+ 14, 15, -1, 16, 17, -1, 18, -1, -1, 19, -1, -1, -1, -1,
-+ -1, -1, -1, -1, -1, -1, -1, -1, 20,
-+ };
-
--Dynamic::ParameterList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-+ {
-+ unsigned int key = hash (str, len);
-
--Dynamic::ExceptionList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-+ {
-+ int slot = lookup[key];
-
--CORBA::Any *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+ if (slot >= 0 && slot < MAX_HASH_VALUE)
-+ {
-+ const char *s = wordlist[slot].opname_;
-
--char *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-+ return &wordlist[slot];
-+ }
-+ else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-+ return 0;
-+ else
-+ {
-+ unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-+ const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-+ const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
-
--CORBA::Boolean
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ while (--ptr >= base)
-+ if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-+ return ptr;
-+ }
-+ }
-+ }
-+ return 0;
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PublishesDef_Perfect_Hash_OpTable -N lookup */
+ unsigned int
+@@ -38381,10 +38238,9 @@
+ }
+ return 0;
}
+-/* ending time is 18:47:29 */
+/* ending time is 11:23:11 */
-+static TAO_IR_PublishesDef_Perfect_Hash_OpTable tao_IR_PublishesDef_optable;
+ static TAO_IR_PublishesDef_Perfect_Hash_OpTable tao_IR_PublishesDef_optable;
--void
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (IR::ProvidesDefSeq * result)
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Implementation
-+//
-+
-+// Factory function Implementation.
-+POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker *POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::the_TAO_PublishesDef_Strategized_Proxy_Broker (void)
- {
-- // Update the result.
-- this->_result = result;
-+ static POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ return &strategized_proxy_broker;
- }
-
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
-
--Dynamic::ParameterList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::_TAO_PublishesDef_Strategized_Proxy_Broker (void)
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ this->proxy_cache_[i] = 0;
-
-- return parameter_list;
- }
-
--Dynamic::ExceptionList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::~_TAO_PublishesDef_Strategized_Proxy_Broker (void)
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ delete this->proxy_cache_[i];
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Implementation
+ //
+@@ -38410,9 +38266,9 @@
-- return exception_list;
}
--CORBA::Any *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
+-IR::_TAO_PublishesDef_Proxy_Impl&
+_TAO_PublishesDef_Proxy_Impl&
-+POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::select_proxy (
+ POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::PublishesDef *object,
+ IR_PublishesDef *object,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-+ TAO_ORB_Core::collocation_strategy (object);
-+
-+ if (this->proxy_cache_[strategy] != 0)
-+ return *this->proxy_cache_[strategy];
-
-- CORBA::Any_var safe_result_any = result_any;
-+ this->create_proxy (strategy, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
-- (*result_any) <<= this->_result;
-+ return *this->proxy_cache_[strategy];
-
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
- }
-
- void
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (IR::UsesDefSeq * result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- CORBA::Environment &
-+POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::create_proxy (
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA::Environment &ACE_TRY_ENV
)
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
-- return parameter_list;
-+ if (this->proxy_cache_[strategy] == 0)
-+ {
-+ switch (strategy)
-+ {
-+ case TAO_ORB_Core::THRU_POA_STRATEGY:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+@@ -38444,7 +38300,7 @@
+ case TAO_ORB_Core::THRU_POA_STRATEGY:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- POA_IR::_TAO_PublishesDef_ThruPOA_Proxy_Impl,
+ _TAO_PublishesDef_ThruPOA_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ case TAO_ORB_Core::REMOTE_STRATEGY:
-+ default:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -38454,7 +38310,7 @@
+ default:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- ::IR::_TAO_PublishesDef_Remote_Proxy_Impl,
+ _TAO_PublishesDef_Remote_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ }
-+
-+ }
- }
-
--Dynamic::ExceptionList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+
-+//
-+// End Strategized Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-+
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -38471,26 +38327,26 @@
+ ///////////////////////////////////////////////////////////////////////
+
+
+-IR::_TAO_PublishesDef_Proxy_Broker *
+-IR__TAO_PublishesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_PublishesDef_Proxy_Broker *
+_TAO_PublishesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ ACE_UNUSED_ARG (obj);
-+ return ::POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::the_TAO_PublishesDef_Strategized_Proxy_Broker();
+ ACE_UNUSED_ARG (obj);
+ return ::POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::the_TAO_PublishesDef_Strategized_Proxy_Broker();
}
--CORBA::Any *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+int
+ int
+-IR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_PublishesDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
-+ ACE_UNUSED_ARG (_dummy_);
+ ACE_UNUSED_ARG (_dummy_);
-- (*result_any) <<= this->_result;
+- IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_PublishesDef_Proxy_Broker_Factory_function;
+ _TAO_PublishesDef_Proxy_Broker_Factory_function_pointer =
+ _TAO_PublishesDef_Proxy_Broker_Factory_function;
-- return safe_result_any._retn ();
-+ return 0;
+ return 0;
}
--char *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
+-static int IR__TAO_PublishesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_PublishesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+ _TAO_PublishesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_PublishesDef_Proxy_Broker_Factory_Initializer));
--CORBA::Boolean
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--void
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (IR::EmitsDefSeq * result)
--{
-- // Update the result.
-- this->_result = result;
--}
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Proxy Implementation
-+//
-
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
-+POA_IR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::_TAO_PublishesDef_ThruPOA_Proxy_Impl (void)
- {}
-
--Dynamic::ParameterList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+POA_IR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::~_TAO_PublishesDef_ThruPOA_Proxy_Impl (void)
-+{}
-
--Dynamic::ExceptionList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+// ThruPOA Implementation of the IDL interface methods
-
--CORBA::Any *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+//
-+// End ThruPOA Proxy Implementation
-+///////////////////////////////////////////////////////////////////////
-
--char *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+// skeleton constructor
-+POA_IR::PublishesDef::PublishesDef (void)
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ this->optable_ = &tao_IR_PublishesDef_optable;
- }
-
--CORBA::Boolean
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+// copy ctor
-+POA_IR::PublishesDef::PublishesDef (const PublishesDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,EventDef) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ ///////////////////////////////////////////////////////////////////////
+@@ -38516,7 +38372,7 @@
+ POA_IR::PublishesDef::PublishesDef (const PublishesDef& rhs)
+ : ACE_NESTED_CLASS (POA_IR,EventDef) (rhs),
+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+ POA_CORBA_IRObject (rhs),
-+ TAO_ServantBase (rhs)
-+{}
-
--void
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (IR::PublishesDefSeq * result)
-+// skeleton destructor
-+POA_IR::PublishesDef::~PublishesDef (void)
- {
-- // Update the result.
-- this->_result = result;
- }
+ TAO_ServantBase (rhs)
+ {}
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get (
-+void POA_IR::PublishesDef::_is_a_skel (
- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- CORBA::Environment &
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::PublishesDef *_tao_impl = (POA_IR::PublishesDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = 0;
-+ CORBA::String_var value;
+@@ -38536,7 +38392,7 @@
+ POA_IR::PublishesDef *_tao_impl = (POA_IR::PublishesDef *) _tao_object_reference;
+ CORBA::Boolean _tao_retval = 0;
+ CORBA::String_var value;
+- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
-+ ACE_THROW (CORBA::MARSHAL ());
-
--Dynamic::ExceptionList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-+ ACE_CHECK;
-
--CORBA::Any *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
- }
-
--char *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::PublishesDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ POA_IR::PublishesDef *_tao_impl = (POA_IR::PublishesDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+ ACE_THROW (CORBA::MARSHAL ());
+
+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+@@ -38544,7 +38400,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
- }
-
--CORBA::Boolean
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+CORBA::Boolean POA_IR::PublishesDef::_is_a (
-+ const char* value,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ if (
-+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PublishesDef:1.0")) ||
-+ (!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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-+ return 1;
-+ else
-+ return 0;
- }
-
--void
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (IR::ConsumesDefSeq * result)
-+void* POA_IR::PublishesDef::_downcast (
-+ const char* logical_type_id
-+ )
- {
-- // Update the result.
-- this->_result = result;
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/PublishesDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::PublishesDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/EventDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::EventDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Contained_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-+ return ACE_static_cast(PortableServer::Servant, this);
-+ return 0;
- }
-
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::PublishesDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
-+ this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
+ ACE_THROW (CORBA::MARSHAL ());
}
--Dynamic::ExceptionList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+const char* POA_IR::PublishesDef::_interface_repository_id (void) const
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ return "IDL:omg.org/IR/PublishesDef:1.0";
+@@ -38561,7 +38417,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
++ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
+ ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Any *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR::PublishesDef*
-+POA_IR::PublishesDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-+ TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
-- CORBA::Any_var safe_result_any = result_any;
-+ CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-+ if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-+ else
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
+@@ -38592,7 +38448,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
+ return ACE_static_cast (POA_IR::Contained_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
++ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+ return ACE_static_cast(PortableServer::Servant, this);
+ return 0;
+@@ -38622,12 +38478,12 @@
+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-- return safe_result_any._retn ();
-+ CORBA::Object_var obj = tmp;
+ CORBA::Object_var obj = tmp;
+- return ::IR::PublishesDef::_unchecked_narrow (obj.in ());
+ return IR_PublishesDef::_unchecked_narrow (obj.in ());
}
--char *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+class TAO_IR_ConsumesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+private:
-+ unsigned int hash (const char *str, unsigned int len);
-+public:
-+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-+};
-+/* starting time is 11:23:11 */
-+/* C++ code produced by gperf version 2.8 (ACE version) */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ConsumesDef_Perfect_Hash_OpTable -N lookup */
-+unsigned int
-+TAO_IR_ConsumesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ static const unsigned char asso_values[] =
-+ {
-+#if defined (ACE_MVS)
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 0, 0, 37, 37, 37, 10, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 0, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37,
-+#else
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-+ 0, 0, 37, 37, 37, 10, 37, 37, 37, 0,
-+ 0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
-+ 37, 10, 37, 37, 37, 37, 37, 37,
-+#endif /* ACE_MVS */
-+ };
-+ return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
--void
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Boolean result)
-+const class TAO_operation_db_entry *
-+TAO_IR_ConsumesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
-- // Update the result.
-- this->_result = result;
--}
-+ enum
-+ {
-+ TOTAL_KEYWORDS = 17,
-+ MIN_WORD_LENGTH = 4,
-+ MAX_WORD_LENGTH = 26,
-+ MIN_HASH_VALUE = 4,
-+ MAX_HASH_VALUE = 36,
-+ HASH_VALUE_RANGE = 33,
-+ DUPLICATES = 4
-+ };
-
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides::TAO_ServerRequestInfo_IR_ComponentDef_create_provides (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
-- IR::InterfaceDef_ptr interface_type,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- interface_type_ (interface_type)
--{}
-
--Dynamic::ParameterList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_interface_type = parameter_list->length ();
-- parameter_list->length (length_interface_type + 1);
-- (*parameter_list)[length_interface_type].argument <<= this->interface_type_;
--
-- (*parameter_list)[length_interface_type].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+ static const class TAO_operation_db_entry wordlist[] =
-+ {
-+ {"",0},{"",0},{"",0},{"",0},
-+ {"move", &POA_IR::ConsumesDef::move_skel},
-+ {"_is_a", &POA_IR::ConsumesDef::_is_a_skel},
-+ {"_get_id", &POA_IR::ConsumesDef::_get_id_skel},
-+ {"_set_id", &POA_IR::ConsumesDef::_set_id_skel},
-+ {"describe", &POA_IR::ConsumesDef::describe_skel},
-+ {"_get_name", &POA_IR::ConsumesDef::_get_name_skel},
-+ {"_set_name", &POA_IR::ConsumesDef::_set_name_skel},
-+ {"_get_version", &POA_IR::ConsumesDef::_get_version_skel},
-+ {"_set_version", &POA_IR::ConsumesDef::_set_version_skel},
-+ {"_get_def_kind", &POA_IR::ConsumesDef::_get_def_kind_skel},
-+ {"is_a", &POA_IR::ConsumesDef::is_a_skel},
-+ {"_get_defined_in", &POA_IR::ConsumesDef::_get_defined_in_skel},
-+ {"destroy", &POA_IR::ConsumesDef::destroy_skel},
-+ {"_get_absolute_name", &POA_IR::ConsumesDef::_get_absolute_name_skel},
-+ {"_get_event", &POA_IR::ConsumesDef::_get_event_skel},
-+ {"_non_existent", &POA_IR::ConsumesDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::ConsumesDef::_get_containing_repository_skel},
-+ };
-
--Dynamic::ExceptionList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ static const signed char lookup[] =
-+ {
-+ -6, -2, -9, -2, 4, 5, -1, -43, 8, -43, -11, -2, -38, 13,
-+ 14, 15, -1, 16, 17, -1, 18, -1, -1, 19, -1, -1, -1, -1,
-+ -1, -1, -1, -1, -1, -1, -1, -1, 20,
-+ };
-
--CORBA::Any *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-+ {
-+ unsigned int key = hash (str, len);
-
--char *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-+ {
-+ int slot = lookup[key];
-
--CORBA::Boolean
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ if (slot >= 0 && slot < MAX_HASH_VALUE)
-+ {
-+ const char *s = wordlist[slot].opname_;
-+
-+ if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-+ return &wordlist[slot];
-+ }
-+ else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-+ return 0;
-+ else
-+ {
-+ unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-+ const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-+ const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ #endif /* TAO_HAS_INTERCEPTORS */
+
-+ while (--ptr >= base)
-+ if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-+ return ptr;
-+ }
-+ }
-+ }
-+ return 0;
+ class TAO_IR_ConsumesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+ {
+ private:
+@@ -38635,7 +38491,7 @@
+ public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 18:47:29 */
++/* starting time is 11:23:11 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ConsumesDef_Perfect_Hash_OpTable -N lookup */
+ unsigned int
+@@ -38763,10 +38619,9 @@
+ }
+ return 0;
}
+-/* ending time is 18:47:29 */
+/* ending time is 11:23:11 */
-+static TAO_IR_ConsumesDef_Perfect_Hash_OpTable tao_IR_ConsumesDef_optable;
+ static TAO_IR_ConsumesDef_Perfect_Hash_OpTable tao_IR_ConsumesDef_optable;
--void
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (IR::ProvidesDef_ptr result)
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Implementation
-+//
-+
-+// Factory function Implementation.
-+POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker *POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::the_TAO_ConsumesDef_Strategized_Proxy_Broker (void)
- {
-- // Update the result.
-- this->_result = result;
-+ static POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ return &strategized_proxy_broker;
- }
-
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses::TAO_ServerRequestInfo_IR_ComponentDef_create_uses (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
-- IR::InterfaceDef_ptr interface_type,
-- const CORBA::Boolean & is_multiple,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- interface_type_ (interface_type),
-- is_multiple_ (is_multiple)
--{}
-
--Dynamic::ParameterList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_interface_type = parameter_list->length ();
-- parameter_list->length (length_interface_type + 1);
-- (*parameter_list)[length_interface_type].argument <<= this->interface_type_;
--
-- (*parameter_list)[length_interface_type].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_is_multiple = parameter_list->length ();
-- parameter_list->length (length_is_multiple + 1);
-- (*parameter_list)[length_is_multiple].argument <<= CORBA::Any::from_boolean (this->is_multiple_);
-- (*parameter_list)[length_is_multiple].mode = Dynamic::PARAM_IN;
-+POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::_TAO_ConsumesDef_Strategized_Proxy_Broker (void)
-+{
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ this->proxy_cache_[i] = 0;
-
-- return safe_parameter_list._retn ();
- }
-
--Dynamic::ExceptionList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::~_TAO_ConsumesDef_Strategized_Proxy_Broker (void)
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ delete this->proxy_cache_[i];
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Implementation
+ //
+@@ -38792,9 +38647,9 @@
-- return exception_list;
}
--CORBA::Any *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
+-IR::_TAO_ConsumesDef_Proxy_Impl&
+_TAO_ConsumesDef_Proxy_Impl&
-+POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::select_proxy (
+ POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::ConsumesDef *object,
+ IR_ConsumesDef *object,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-+ TAO_ORB_Core::collocation_strategy (object);
-
-- CORBA::Any_var safe_result_any = result_any;
-+ if (this->proxy_cache_[strategy] != 0)
-+ return *this->proxy_cache_[strategy];
-
-- (*result_any) <<= this->_result;
-+ this->create_proxy (strategy, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-+
-+ return *this->proxy_cache_[strategy];
-
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
- }
-
- void
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (IR::UsesDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
--
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits::TAO_ServerRequestInfo_IR_ComponentDef_create_emits (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
-- IR::ValueDef_ptr value,
-- CORBA::Environment &
-+POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::create_proxy (
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA::Environment &ACE_TRY_ENV
)
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- value_ (value)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+{
-+ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-+ if (this->proxy_cache_[strategy] == 0)
-+ {
-+ switch (strategy)
-+ {
-+ case TAO_ORB_Core::THRU_POA_STRATEGY:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+ {
+@@ -38826,7 +38681,7 @@
+ case TAO_ORB_Core::THRU_POA_STRATEGY:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- POA_IR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl,
+ _TAO_ConsumesDef_ThruPOA_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ case TAO_ORB_Core::REMOTE_STRATEGY:
-+ default:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -38836,7 +38691,7 @@
+ default:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- ::IR::_TAO_ConsumesDef_Remote_Proxy_Impl,
+ _TAO_ConsumesDef_Remote_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ }
-
-- CORBA::ULong length_value = parameter_list->length ();
-- parameter_list->length (length_value + 1);
-- (*parameter_list)[length_value].argument <<= this->value_;
--
-- (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ }
- }
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -38853,26 +38708,26 @@
+ ///////////////////////////////////////////////////////////////////////
--Dynamic::ExceptionList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+
-+//
-+// End Strategized Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-+
+
+-IR::_TAO_ConsumesDef_Proxy_Broker *
+-IR__TAO_ConsumesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_ConsumesDef_Proxy_Broker *
+_TAO_ConsumesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ ACE_UNUSED_ARG (obj);
-+ return ::POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::the_TAO_ConsumesDef_Strategized_Proxy_Broker();
+ ACE_UNUSED_ARG (obj);
+ return ::POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::the_TAO_ConsumesDef_Strategized_Proxy_Broker();
}
--CORBA::Any *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+int
+ int
+-IR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
-+ ACE_UNUSED_ARG (_dummy_);
+ ACE_UNUSED_ARG (_dummy_);
-- (*result_any) <<= this->_result;
+- IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_ConsumesDef_Proxy_Broker_Factory_function;
+ _TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer =
+ _TAO_ConsumesDef_Proxy_Broker_Factory_function;
-- return safe_result_any._retn ();
-+ return 0;
+ return 0;
}
--char *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
+-static int IR__TAO_ConsumesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_ConsumesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+ _TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ConsumesDef_Proxy_Broker_Factory_Initializer));
--CORBA::Boolean
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--void
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (IR::EmitsDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Proxy Implementation
-+//
-
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
-- IR::ValueDef_ptr value,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- value_ (value)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_value = parameter_list->length ();
-- parameter_list->length (length_value + 1);
-- (*parameter_list)[length_value].argument <<= this->value_;
--
-- (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+POA_IR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::_TAO_ConsumesDef_ThruPOA_Proxy_Impl (void)
-+{}
-
--Dynamic::ExceptionList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+POA_IR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::~_TAO_ConsumesDef_ThruPOA_Proxy_Impl (void)
-+{}
-
--CORBA::Any *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+// ThruPOA Implementation of the IDL interface methods
-+
-+//
-+// End ThruPOA Proxy Implementation
-+///////////////////////////////////////////////////////////////////////
-
--char *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+// skeleton constructor
-+POA_IR::ConsumesDef::ConsumesDef (void)
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ this->optable_ = &tao_IR_ConsumesDef_optable;
- }
-
--CORBA::Boolean
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+// copy ctor
-+POA_IR::ConsumesDef::ConsumesDef (const ConsumesDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,EventDef) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ ///////////////////////////////////////////////////////////////////////
+@@ -38898,7 +38753,7 @@
+ POA_IR::ConsumesDef::ConsumesDef (const ConsumesDef& rhs)
+ : ACE_NESTED_CLASS (POA_IR,EventDef) (rhs),
+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+ POA_CORBA_IRObject (rhs),
-+ TAO_ServantBase (rhs)
-+{}
-+
-+// skeleton destructor
-+POA_IR::ConsumesDef::~ConsumesDef (void)
- {
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
- }
-
--void
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (IR::PublishesDef_ptr result)
-+void POA_IR::ConsumesDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- // Update the result.
-- this->_result = result;
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ConsumesDef *_tao_impl = (POA_IR::ConsumesDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = 0;
-+ CORBA::String_var value;
+ TAO_ServantBase (rhs)
+ {}
+
+@@ -38918,7 +38773,7 @@
+ POA_IR::ConsumesDef *_tao_impl = (POA_IR::ConsumesDef *) _tao_object_reference;
+ CORBA::Boolean _tao_retval = 0;
+ CORBA::String_var value;
+- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
-+ ACE_THROW (CORBA::MARSHAL ());
-+
-+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+ ACE_THROW (CORBA::MARSHAL ());
+
+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+@@ -38926,7 +38781,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (CORBA::MARSHAL ());
}
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes (
-+void POA_IR::ConsumesDef::_non_existent_skel (
- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
-- IR::ValueDef_ptr value,
-- CORBA::Environment &
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- value_ (value)
--{}
--
--Dynamic::ParameterList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_value = parameter_list->length ();
-- parameter_list->length (length_value + 1);
-- (*parameter_list)[length_value].argument <<= this->value_;
--
-- (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+{
-+ POA_IR::ConsumesDef *_tao_impl = (POA_IR::ConsumesDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+@@ -38943,7 +38798,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (CORBA::MARSHAL ());
}
--Dynamic::ExceptionList *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+CORBA::Boolean POA_IR::ConsumesDef::_is_a (
-+ const char* value,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ if (
-+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ConsumesDef:1.0")) ||
-+ (!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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-+ return 1;
-+ else
-+ return 0;
- }
-
--CORBA::Any *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void* POA_IR::ConsumesDef::_downcast (
-+ const char* logical_type_id
-+ )
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ConsumesDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::ConsumesDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/EventDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::EventDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Contained_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+@@ -38974,7 +38829,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
+ return ACE_static_cast (POA_IR::Contained_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-+ return ACE_static_cast(PortableServer::Servant, this);
-+ return 0;
- }
-
--char *
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::ConsumesDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--CORBA::Boolean
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+const char* POA_IR::ConsumesDef::_interface_repository_id (void) const
- {
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ return "IDL:omg.org/IR/ConsumesDef:1.0";
- }
-
--void
--POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (IR::ConsumesDef_ptr result)
-+IR::ConsumesDef*
-+POA_IR::ConsumesDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
-- // Update the result.
-- this->_result = result;
-+ TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (0);
-+
-+ CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-+
-+ if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-+ else
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-+
-+ CORBA::Object_var obj = tmp;
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+ return ACE_static_cast(PortableServer::Servant, this);
+ return 0;
+@@ -39004,12 +38859,12 @@
+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
+
+ CORBA::Object_var obj = tmp;
+- return ::IR::ConsumesDef::_unchecked_narrow (obj.in ());
+ return IR_ConsumesDef::_unchecked_narrow (obj.in ());
}
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+class TAO_IR_ComponentDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_ComponentDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
private:
- unsigned int hash (const char *str, unsigned int len);
+@@ -39017,7 +38872,7 @@
public:
const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
};
--/* starting time is 16:31:13 */
+-/* starting time is 18:47:29 */
+/* starting time is 11:23:11 */
/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable -N lookup */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ComponentDef_Perfect_Hash_OpTable -N lookup */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ComponentDef_Perfect_Hash_OpTable -N lookup */
unsigned int
--TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+TAO_IR_ComponentDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
- static const unsigned char asso_values[] =
- {
- #if defined (ACE_MVS)
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 0,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 0,
-- 32, 32, 0, 0, 32, 32, 32, 10, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 0, 5,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 10, 32, 32, 32, 32, 5, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 0,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 0,
-+ 82, 30, 5, 10, 82, 82, 82, 0, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 45, 30, 15,
-+ 82, 30, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 0, 20, 82, 82, 82, 30, 25, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82,
- #else
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-- 32, 32, 32, 32, 32, 0, 32, 0, 32, 32,
-- 0, 0, 32, 32, 32, 10, 32, 32, 32, 0,
-- 5, 32, 32, 32, 32, 32, 10, 32, 32, 32,
-- 32, 5, 32, 32, 32, 32, 32, 32,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-+ 82, 82, 82, 82, 82, 0, 82, 0, 82, 30,
-+ 5, 10, 82, 82, 82, 0, 82, 82, 45, 30,
-+ 15, 82, 30, 82, 82, 0, 20, 82, 82, 82,
-+ 30, 25, 82, 82, 82, 82, 82, 82,
- #endif /* ACE_MVS */
- };
- return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
- const class TAO_operation_db_entry *
--TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+TAO_IR_ComponentDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
- enum
- {
-- TOTAL_KEYWORDS = 17,
-+ TOTAL_KEYWORDS = 54,
- MIN_WORD_LENGTH = 4,
- MAX_WORD_LENGTH = 26,
- MIN_HASH_VALUE = 4,
-- MAX_HASH_VALUE = 31,
-- HASH_VALUE_RANGE = 28,
-- DUPLICATES = 4
-+ MAX_HASH_VALUE = 81,
-+ HASH_VALUE_RANGE = 78,
-+ DUPLICATES = 16
- };
-
- static const class TAO_operation_db_entry wordlist[] =
- {
- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::PrimaryKeyDef::move_skel},
-- {"_is_a", &POA_IR::PrimaryKeyDef::_is_a_skel},
-- {"_get_id", &POA_IR::PrimaryKeyDef::_get_id_skel},
-- {"_set_id", &POA_IR::PrimaryKeyDef::_set_id_skel},
-- {"describe", &POA_IR::PrimaryKeyDef::describe_skel},
-- {"_get_name", &POA_IR::PrimaryKeyDef::_get_name_skel},
-- {"_set_name", &POA_IR::PrimaryKeyDef::_set_name_skel},
-- {"destroy", &POA_IR::PrimaryKeyDef::destroy_skel},
-- {"_get_def_kind", &POA_IR::PrimaryKeyDef::_get_def_kind_skel},
-- {"is_a", &POA_IR::PrimaryKeyDef::is_a_skel},
-- {"_get_version", &POA_IR::PrimaryKeyDef::_get_version_skel},
-- {"_set_version", &POA_IR::PrimaryKeyDef::_set_version_skel},
-- {"_get_absolute_name", &POA_IR::PrimaryKeyDef::_get_absolute_name_skel},
-- {"_get_defined_in", &POA_IR::PrimaryKeyDef::_get_defined_in_skel},
-- {"_get_primary_key", &POA_IR::PrimaryKeyDef::_get_primary_key_skel},
-- {"_non_existent", &POA_IR::PrimaryKeyDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::PrimaryKeyDef::_get_containing_repository_skel},
-+ {"is_a", &POA_IR::ComponentDef::is_a_skel},
-+ {"_is_a", &POA_IR::ComponentDef::_is_a_skel},
-+ {"_get_id", &POA_IR::ComponentDef::_get_id_skel},
-+ {"_set_id", &POA_IR::ComponentDef::_set_id_skel},
-+ {"_get_emits_events", &POA_IR::ComponentDef::_get_emits_events_skel},
-+ {"_get_def_kind", &POA_IR::ComponentDef::_get_def_kind_skel},
-+ {"_get_name", &POA_IR::ComponentDef::_get_name_skel},
-+ {"_get_type", &POA_IR::ComponentDef::_get_type_skel},
-+ {"_set_name", &POA_IR::ComponentDef::_set_name_skel},
-+ {"_get_uses_interfaces", &POA_IR::ComponentDef::_get_uses_interfaces_skel},
-+ {"_set_base_interfaces", &POA_IR::ComponentDef::_set_base_interfaces_skel},
-+ {"_get_base_interfaces", &POA_IR::ComponentDef::_get_base_interfaces_skel},
-+ {"_get_consumes_events", &POA_IR::ComponentDef::_get_consumes_events_skel},
-+ {"_get_publishes_events", &POA_IR::ComponentDef::_get_publishes_events_skel},
-+ {"describe_contents", &POA_IR::ComponentDef::describe_contents_skel},
-+ {"describe", &POA_IR::ComponentDef::describe_skel},
-+ {"_get_provides_interfaces", &POA_IR::ComponentDef::_get_provides_interfaces_skel},
-+ {"_get_supported_interfaces", &POA_IR::ComponentDef::_get_supported_interfaces_skel},
-+ {"_set_supported_interfaces", &POA_IR::ComponentDef::_set_supported_interfaces_skel},
-+ {"_get_version", &POA_IR::ComponentDef::_get_version_skel},
-+ {"_set_version", &POA_IR::ComponentDef::_set_version_skel},
-+ {"_get_absolute_name", &POA_IR::ComponentDef::_get_absolute_name_skel},
-+ {"_get_defined_in", &POA_IR::ComponentDef::_get_defined_in_skel},
-+ {"_non_existent", &POA_IR::ComponentDef::_non_existent_skel},
-+ {"_get_is_abstract", &POA_IR::ComponentDef::_get_is_abstract_skel},
-+ {"_set_is_abstract", &POA_IR::ComponentDef::_set_is_abstract_skel},
-+ {"destroy", &POA_IR::ComponentDef::destroy_skel},
-+ {"contents", &POA_IR::ComponentDef::contents_skel},
-+ {"_get_base_component", &POA_IR::ComponentDef::_get_base_component_skel},
-+ {"create_uses", &POA_IR::ComponentDef::create_uses_skel},
-+ {"create_emits", &POA_IR::ComponentDef::create_emits_skel},
-+ {"create_alias", &POA_IR::ComponentDef::create_alias_skel},
-+ {"_get_is_basic", &POA_IR::ComponentDef::_get_is_basic_skel},
-+ {"move", &POA_IR::ComponentDef::move_skel},
-+ {"create_provides", &POA_IR::ComponentDef::create_provides_skel},
-+ {"create_consumes", &POA_IR::ComponentDef::create_consumes_skel},
-+ {"create_publishes", &POA_IR::ComponentDef::create_publishes_skel},
-+ {"_get_containing_repository", &POA_IR::ComponentDef::_get_containing_repository_skel},
-+ {"create_value", &POA_IR::ComponentDef::create_value_skel},
-+ {"create_module", &POA_IR::ComponentDef::create_module_skel},
-+ {"create_native", &POA_IR::ComponentDef::create_native_skel},
-+ {"create_attribute", &POA_IR::ComponentDef::create_attribute_skel},
-+ {"create_interface", &POA_IR::ComponentDef::create_interface_skel},
-+ {"create_union", &POA_IR::ComponentDef::create_union_skel},
-+ {"_get_is_local", &POA_IR::ComponentDef::_get_is_local_skel},
-+ {"_set_is_local", &POA_IR::ComponentDef::_set_is_local_skel},
-+ {"create_operation", &POA_IR::ComponentDef::create_operation_skel},
-+ {"create_exception", &POA_IR::ComponentDef::create_exception_skel},
-+ {"create_struct", &POA_IR::ComponentDef::create_struct_skel},
-+ {"create_constant", &POA_IR::ComponentDef::create_constant_skel},
-+ {"lookup_name", &POA_IR::ComponentDef::lookup_name_skel},
-+ {"create_enum", &POA_IR::ComponentDef::create_enum_skel},
-+ {"create_value_box", &POA_IR::ComponentDef::create_value_box_skel},
-+ {"lookup", &POA_IR::ComponentDef::lookup_skel},
- };
-
- static const signed char lookup[] =
- {
-- -6, -2, -9, -2, 4, 5, -1, -38, 8, -38, -1, -1, 11, 12,
-- 13, -14, -2, -33, 16, -1, 17, 18, -1, 19, -1, -1, -1, -1,
-- -1, -1, -1, 20,
-+ -1, -1, -6, -2, 4, 5, -10, -3, -13, -4, -21, -2, -91, -23,
-+ -2, -28, -2, 8, 9, -94, -93, 17, 18, 19, 20, -96, -1, -95,
-+ 25, -1, 26, -34, -2, 27, -38, -2, -102, 30, 31, 32, -1, 33,
-+ -92, 36, 37, -92, 40, -43, -2, -45, -2, 41, 42, -87, -48, -2,
-+ -88, 47, -85, -50, -2, -83, -1, 52, -1, 53, 54, -1, -1, -1,
-+ -1, 55, -1, -1, -1, -1, 56, -1, -1, -1, -1, 57,
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -42529,137 +21014,541 @@
+@@ -39185,10 +39040,9 @@
}
return 0;
}
--/* ending time is 16:31:13 */
--static TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable tao_IR_PrimaryKeyDef_optable;
--
+-/* ending time is 18:47:29 */
+/* ending time is 11:23:11 */
-+static TAO_IR_ComponentDef_Perfect_Hash_OpTable tao_IR_ComponentDef_optable;
+ static TAO_IR_ComponentDef_Perfect_Hash_OpTable tao_IR_ComponentDef_optable;
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Implementation
//
+@@ -39214,9 +39068,9 @@
+
+ }
--// Factory function Implementation.
--POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker *POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::the_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void)
-+// Factory function Implementation.
-+POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker *POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::the_TAO_ComponentDef_Strategized_Proxy_Broker (void)
-+{
-+ static POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ return &strategized_proxy_broker;
-+}
-+
-+POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::_TAO_ComponentDef_Strategized_Proxy_Broker (void)
-+{
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ this->proxy_cache_[i] = 0;
-+
-+}
-+
-+POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::~_TAO_ComponentDef_Strategized_Proxy_Broker (void)
-+{
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ delete this->proxy_cache_[i];
-+
-+}
-+
+-IR::_TAO_ComponentDef_Proxy_Impl&
+_TAO_ComponentDef_Proxy_Impl&
-+POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::select_proxy (
+ POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::ComponentDef *object,
+ IR_ComponentDef *object,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+{
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-+ TAO_ORB_Core::collocation_strategy (object);
-+
-+ if (this->proxy_cache_[strategy] != 0)
-+ return *this->proxy_cache_[strategy];
-+
-+ this->create_proxy (strategy, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-+
-+ return *this->proxy_cache_[strategy];
-+
-+}
-+
-+void
-+POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::create_proxy (
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+{
-+ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-+
-+ if (this->proxy_cache_[strategy] == 0)
-+ {
-+ switch (strategy)
-+ {
-+ case TAO_ORB_Core::THRU_POA_STRATEGY:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -39248,7 +39102,7 @@
+ case TAO_ORB_Core::THRU_POA_STRATEGY:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl,
+ _TAO_ComponentDef_ThruPOA_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ case TAO_ORB_Core::REMOTE_STRATEGY:
-+ default:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -39258,7 +39112,7 @@
+ default:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- ::IR::_TAO_ComponentDef_Remote_Proxy_Impl,
+ _TAO_ComponentDef_Remote_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ }
-+
-+ }
-+}
-+
-+
-+//
-+// End Strategized Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-+
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -39275,26 +39129,26 @@
+ ///////////////////////////////////////////////////////////////////////
+
+
+-IR::_TAO_ComponentDef_Proxy_Broker *
+-IR__TAO_ComponentDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_ComponentDef_Proxy_Broker *
+_TAO_ComponentDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+{
-+ ACE_UNUSED_ARG (obj);
-+ return ::POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::the_TAO_ComponentDef_Strategized_Proxy_Broker();
-+}
-+
-+int
+ {
+ ACE_UNUSED_ARG (obj);
+ return ::POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::the_TAO_ComponentDef_Strategized_Proxy_Broker();
+ }
+
+ int
+-IR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_ComponentDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+{
-+ ACE_UNUSED_ARG (_dummy_);
-+
+ {
+ ACE_UNUSED_ARG (_dummy_);
+
+- IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_ComponentDef_Proxy_Broker_Factory_function;
+ _TAO_ComponentDef_Proxy_Broker_Factory_function_pointer =
+ _TAO_ComponentDef_Proxy_Broker_Factory_function;
-+
-+ return 0;
-+}
-+
+
+ return 0;
+ }
+
+-static int IR__TAO_ComponentDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_ComponentDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+ _TAO_ComponentDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ComponentDef_Proxy_Broker_Factory_Initializer));
-+
-+
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Proxy Implementation
-+//
-+
-+POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_TAO_ComponentDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::~_TAO_ComponentDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+// ThruPOA Implementation of the IDL interface methods
-+
-+IR::InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
+
+
+ ///////////////////////////////////////////////////////////////////////
+@@ -39306,7 +39160,7 @@
+
+ // ThruPOA Implementation of the IDL interface methods
+
+-IR::InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
++IR_InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -39314,7 +39168,7 @@
+ CORBA::SystemException
+ ))
+ {
+- IR::InterfaceDefSeq_var _tao_retval;
+ IR_InterfaceDefSeq_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "supported_interfaces",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ComponentDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ComponentDef:1.0"
-+ )
-+ )->supported_interfaces (
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+void POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
-+ CORBA_Object *_collocated_tao_target_,
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -39339,7 +39193,7 @@
+
+ void POA_IR::_TAO_ComponentDef_ThruPOA_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_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "supported_interfaces",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK;
-+ ACE_reinterpret_cast (
-+ POA_IR::ComponentDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ComponentDef:1.0"
-+ )
-+ )->supported_interfaces (
-+ supported_interfaces,
-+ ACE_TRY_ENV
-+ );
-+ return;
-+}
-+
-+IR::ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_component (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -39369,7 +39223,7 @@
+ return;
+ }
+
+-IR::ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_component (
++IR_ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_component (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -39377,7 +39231,7 @@
+ CORBA::SystemException
+ ))
+ {
+- IR::ComponentDef_var _tao_retval;
+ IR_ComponentDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "base_component",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ComponentDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ComponentDef:1.0"
-+ )
-+ )->base_component (
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+IR::ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_interfaces (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -39400,7 +39254,7 @@
+ );
+ }
+
+-IR::ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_interfaces (
++IR_ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -39408,7 +39262,7 @@
+ CORBA::SystemException
+ ))
+ {
+- IR::ProvidesDefSeq_var _tao_retval;
+ IR_ProvidesDefSeq_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "provides_interfaces",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ComponentDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ComponentDef:1.0"
-+ )
-+ )->provides_interfaces (
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+IR::UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -39431,7 +39285,7 @@
+ );
+ }
+
+-IR::UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces (
++IR_UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -39439,7 +39293,7 @@
+ CORBA::SystemException
+ ))
+ {
+- IR::UsesDefSeq_var _tao_retval;
+ IR_UsesDefSeq_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "uses_interfaces",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ComponentDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ComponentDef:1.0"
-+ )
-+ )->uses_interfaces (
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+IR::EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- static POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker strategized_proxy_broker;
-- return &strategized_proxy_broker;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -39462,7 +39316,7 @@
+ );
+ }
+
+-IR::EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events (
++IR_EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -39470,7 +39324,7 @@
+ CORBA::SystemException
+ ))
+ {
+- IR::EmitsDefSeq_var _tao_retval;
+ IR_EmitsDefSeq_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "emits_events",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ComponentDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ComponentDef:1.0"
-+ )
-+ )->emits_events (
-+ ACE_TRY_ENV
-+ );
- }
-
--POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void)
-+IR::PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_events (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- this->proxy_cache_[i] = 0;
--
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -39493,7 +39347,7 @@
+ );
+ }
+
+-IR::PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_events (
++IR_PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_events (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -39501,7 +39355,7 @@
+ CORBA::SystemException
+ ))
+ {
+- IR::PublishesDefSeq_var _tao_retval;
+ IR_PublishesDefSeq_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "publishes_events",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ComponentDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ComponentDef:1.0"
-+ )
-+ )->publishes_events (
-+ ACE_TRY_ENV
-+ );
- }
-
--POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::~_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void)
-+IR::ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_events (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- delete this->proxy_cache_[i];
--
-+ IR_ConsumesDefSeq_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "consumes_events",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ComponentDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ComponentDef:1.0"
-+ )
-+ )->consumes_events (
-+ ACE_TRY_ENV
-+ );
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -39524,7 +39378,7 @@
+ );
}
--IR::_TAO_PrimaryKeyDef_Proxy_Impl&
--POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::PrimaryKeyDef *object,
-+CORBA::Boolean POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::is_basic (
-+ CORBA_Object *_collocated_tao_target_,
+-IR::ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_events (
++IR_ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_events (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
+@@ -39532,7 +39386,7 @@
+ CORBA::SystemException
+ ))
{
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-- TAO_ORB_Core::collocation_strategy (object);
--
-- if (this->proxy_cache_[strategy] != 0)
-- return *this->proxy_cache_[strategy];
--
-- this->create_proxy (strategy, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
--
-- return *this->proxy_cache_[strategy];
--
-+ CORBA::Boolean _tao_retval = 0;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "is_basic",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (_tao_retval);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ComponentDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ComponentDef:1.0"
-+ )
-+ )->is_basic (
-+ ACE_TRY_ENV
-+ );
- }
-
--void
--POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::create_proxy (
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-+IR::ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provides (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * id,
-+ const char * name,
-+ const char * version,
+- IR::ConsumesDefSeq_var _tao_retval;
++ IR_ConsumesDefSeq_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -39586,19 +39440,19 @@
+ );
+ }
+
+-IR::ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provides (
++IR_ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_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 ((
-+ CORBA::SystemException
-+ ))
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
{
-- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
--
-- if (this->proxy_cache_[strategy] == 0)
-- {
-- switch (strategy)
-- {
-- case TAO_ORB_Core::THRU_POA_STRATEGY:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- case TAO_ORB_Core::REMOTE_STRATEGY:
-- default:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- ::IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- }
--
-- }
+- IR::ProvidesDef_var _tao_retval;
+ IR_ProvidesDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_provides",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ComponentDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ComponentDef:1.0"
-+ )
-+ )->create_provides (
-+ id,
-+ name,
-+ version,
-+ interface_type,
-+ ACE_TRY_ENV
-+ );
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -39625,12 +39479,12 @@
+ );
}
--
--//
--// End Strategized Proxy Broker Implementation
--///////////////////////////////////////////////////////////////////////
--
--
--IR::_TAO_PrimaryKeyDef_Proxy_Broker *
--IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+IR::UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * id,
-+ const char * name,
-+ const char * version,
+-IR::UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses (
++IR_UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_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
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::the_TAO_PrimaryKeyDef_Strategized_Proxy_Broker();
+ CORBA::Boolean is_multiple,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -39638,7 +39492,7 @@
+ CORBA::SystemException
+ ))
+ {
+- IR::UsesDef_var _tao_retval;
+ IR_UsesDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_uses",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ComponentDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ComponentDef:1.0"
-+ )
-+ )->create_uses (
-+ id,
-+ name,
-+ version,
-+ interface_type,
-+ is_multiple,
-+ ACE_TRY_ENV
-+ );
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -39666,19 +39520,19 @@
+ );
}
--int
--IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+IR::EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * id,
-+ const char * name,
-+ const char * version,
+-IR::EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits (
++IR_EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_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 ((
-+ CORBA::SystemException
-+ ))
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
{
-- ACE_UNUSED_ARG (_dummy_);
--
-- IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function;
--
-- return 0;
+- IR::EmitsDef_var _tao_retval;
+ IR_EmitsDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_emits",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::ComponentDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/ComponentDef:1.0"
-+ )
-+ )->create_emits (
-+ id,
-+ name,
-+ version,
-+ value,
-+ ACE_TRY_ENV
-+ );
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -39705,19 +39559,19 @@
+ );
}
--static int IR__TAO_PrimaryKeyDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_Initializer));
--
--
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Proxy Implementation
--//
--
--POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl (void)
--{}
--
--// ThruPOA Implementation of the IDL interface methods
--
--CORBA::Boolean POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::is_a (
-+IR::PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publishes (
+-IR::PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publishes (
++IR_PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publishes (
CORBA_Object *_collocated_tao_target_,
-- const char * primary_key_id,
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr value,
+ IR_ValueDef_ptr value,
CORBA::Environment &ACE_TRY_ENV
)
@@ -53180,46 +9506,22 @@
CORBA::SystemException
))
{
-- CORBA::Boolean _tao_retval = 0;
+- IR::PublishesDef_var _tao_retval;
+ IR_PublishesDef_var _tao_retval;
ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -42667,31 +21556,38 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "is_a",
-+ "create_publishes",
- forward_to.out (),
- ACE_TRY_ENV
- );
-- ACE_CHECK_RETURN (_tao_retval);
-+ ACE_CHECK_RETURN (0);
- return ACE_reinterpret_cast (
-- POA_IR::PrimaryKeyDef_ptr,
-+ POA_IR::ComponentDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/PrimaryKeyDef:1.0"
-+ "IDL:omg.org/IR/ComponentDef:1.0"
- )
-- )->is_a (
-- primary_key_id,
-+ )->create_publishes (
-+ id,
-+ name,
-+ version,
-+ value,
- ACE_TRY_ENV
+@@ -39744,19 +39598,19 @@
);
}
--IR::ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key (
-+IR::ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consumes (
+-IR::ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consumes (
++IR_ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consumes (
CORBA_Object *_collocated_tao_target_,
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr value,
+ IR_ValueDef_ptr value,
CORBA::Environment &ACE_TRY_ENV
)
@@ -53227,1197 +9529,328 @@
CORBA::SystemException
))
{
-- IR::ValueDef_var _tao_retval;
+- IR::ConsumesDef_var _tao_retval;
+ IR_ConsumesDef_var _tao_retval;
ACE_UNUSED_ARG (_tao_retval);
TAO_Object_Adapter::Servant_Upcall servant_upcall (
_collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -42699,17 +21595,21 @@
- CORBA::Object_var forward_to;
- servant_upcall.prepare_for_upcall (
- _collocated_tao_target_->_object_key (),
-- "primary_key",
-+ "create_consumes",
- forward_to.out (),
- ACE_TRY_ENV
- );
- ACE_CHECK_RETURN (0);
- return ACE_reinterpret_cast (
-- POA_IR::PrimaryKeyDef_ptr,
-+ POA_IR::ComponentDef_ptr,
- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/PrimaryKeyDef:1.0"
-+ "IDL:omg.org/IR/ComponentDef:1.0"
- )
-- )->primary_key (
-+ )->create_consumes (
-+ id,
-+ name,
-+ version,
-+ value,
- ACE_TRY_ENV
- );
- }
-@@ -42719,836 +21619,511 @@
- ///////////////////////////////////////////////////////////////////////
-
- // skeleton constructor
--POA_IR::PrimaryKeyDef::PrimaryKeyDef (void)
-+POA_IR::ComponentDef::ComponentDef (void)
- {
-- this->optable_ = &tao_IR_PrimaryKeyDef_optable;
-+ this->optable_ = &tao_IR_ComponentDef_optable;
- }
-
- // copy ctor
--POA_IR::PrimaryKeyDef::PrimaryKeyDef (const PrimaryKeyDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+@@ -39799,7 +39653,7 @@
+ ACE_NESTED_CLASS (POA_IR,Container) (rhs),
+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+POA_IR::ComponentDef::ComponentDef (const ComponentDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,InterfaceDef) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+ POA_CORBA_IRObject (rhs),
TAO_ServantBase (rhs)
{}
- // skeleton destructor
--POA_IR::PrimaryKeyDef::~PrimaryKeyDef (void)
-+POA_IR::ComponentDef::~ComponentDef (void)
+@@ -39817,7 +39671,7 @@
{
- }
-
--void POA_IR::PrimaryKeyDef::is_a_skel (
-+void POA_IR::ComponentDef::_get_supported_interfaces_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *)_tao_object_reference;
--
-- CORBA::Boolean _tao_retval = 0;
-- CORBA::String_var primary_key_id;
-- if (!(
-- (_tao_in >> primary_key_id.out ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-
+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
+
+- IR::InterfaceDefSeq_var _tao_retval;
+ IR_InterfaceDefSeq_var _tao_retval;
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- primary_key_id.in (),
-+ _tao_retval = _tao_impl->supported_interfaces (
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->is_a (
-- primary_key_id.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::Boolean _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-+
-+ _tao_server_request.init_reply ();
- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(
-- (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-+ (_tao_out << _tao_retval.in ())
- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void POA_IR::PrimaryKeyDef::_get_primary_key_skel (
-+void POA_IR::ComponentDef::_set_supported_interfaces_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *)_tao_object_reference;
--
-- IR::ValueDef_var _tao_retval;
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->primary_key (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -39844,7 +39698,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -39898,14 +39752,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
+
+- _tao_server_request.argument_flag (0);
+- IR::InterfaceDefSeq supported_interfaces;
+ IR_InterfaceDefSeq supported_interfaces;
if (!(
-- (_tao_out << _tao_retval.in ())
-+ (_tao_in >> supported_interfaces)
+ (_tao_in >> supported_interfaces)
))
-- ACE_THROW (CORBA::MARSHAL());
-+ ACE_THROW (CORBA::MARSHAL () );
+ ACE_THROW (CORBA::MARSHAL());
--}
-+ _tao_impl->supported_interfaces (
-+ supported_interfaces,
-+ ACE_TRY_ENV
-+ );
-
--void POA_IR::PrimaryKeyDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = 0;
-- CORBA::String_var value;
-- if (!(_tao_in >> value.out ()))
-- ACE_THROW (CORBA::MARSHAL ());
--
-- _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
--}
-
--void POA_IR::PrimaryKeyDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-- ACE_CHECK;
--
- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
- }
-
--CORBA::Boolean POA_IR::PrimaryKeyDef::_is_a (
-- const char* value,
-+void POA_IR::ComponentDef::_get_base_component_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
- 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-- return 1;
-- else
-- return 0;
--}
--
--void* POA_IR::PrimaryKeyDef::_downcast (
-- const char* logical_type_id
-- )
--{
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/PrimaryKeyDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::PrimaryKeyDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-- return ACE_static_cast (POA_IR::Contained_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-- return ACE_static_cast(PortableServer::Servant, this);
-- return 0;
--}
--
--void POA_IR::PrimaryKeyDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
--{
-- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
--}
--
--const char* POA_IR::PrimaryKeyDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/PrimaryKeyDef:1.0";
--}
-
--IR::PrimaryKeyDef*
--POA_IR::PrimaryKeyDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+)
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -39976,7 +39828,7 @@
{
-- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Object_ptr tmp = CORBA::Object::_nil ();
--
-- if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-- else
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
--
-- CORBA::Object_var obj = tmp;
-- return ::IR::PrimaryKeyDef::_unchecked_narrow (obj.in ());
--}
--
-+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::PrimaryKeyDef *tao_impl
-- ,
-- const char * primary_key_id,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- primary_key_id_ (primary_key_id)
--{}
+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
+
+- IR::ComponentDef_var _tao_retval;
+ IR_ComponentDef_var _tao_retval;
--Dynamic::ParameterList *
--POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_primary_key_id = parameter_list->length ();
-- parameter_list->length (length_primary_key_id + 1);
-- (*parameter_list)[length_primary_key_id].argument <<= primary_key_id_;
-- (*parameter_list)[length_primary_key_id].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+ _tao_retval = _tao_impl->base_component (
-+ ACE_TRY_ENV
-+ );
-
--Dynamic::ExceptionList *
--POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ ACE_CHECK;
-
--CORBA::Any *
--POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
--
-- return safe_result_any._retn ();
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--char *
--POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::ComponentDef::_get_provides_interfaces_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-
--CORBA::Boolean
--POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -40003,7 +39855,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ComponentDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_ComponentDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -40056,7 +39908,7 @@
+ {
+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
+
+- IR::ProvidesDefSeq_var _tao_retval;
+ IR_ProvidesDefSeq_var _tao_retval;
--void
--POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Boolean result)
--{
-- // Update the result.
-- this->_result = result;
--}
-+ _tao_retval = _tao_impl->provides_interfaces (
-+ ACE_TRY_ENV
-+ );
-
--POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::PrimaryKeyDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
-+ ACE_CHECK;
-
--Dynamic::ParameterList *
--POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--Dynamic::ExceptionList *
--POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::ComponentDef::_get_uses_interfaces_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-
--CORBA::Any *
--POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -40083,7 +39935,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ProvidesDefSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_ProvidesDefSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -40136,7 +39988,7 @@
+ {
+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
+
+- IR::UsesDefSeq_var _tao_retval;
+ IR_UsesDefSeq_var _tao_retval;
--char *
--POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ _tao_retval = _tao_impl->uses_interfaces (
-+ ACE_TRY_ENV
-+ );
-
--CORBA::Boolean
--POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+ ACE_CHECK;
-
--void
--POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (IR::ValueDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_FactoryDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
--{
--private:
-- unsigned int hash (const char *str, unsigned int len);
--public:
-- const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
--};
--/* starting time is 16:31:13 */
--/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FactoryDef_Perfect_Hash_OpTable -N lookup */
--unsigned int
--TAO_IR_FactoryDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+void POA_IR::ComponentDef::_get_emits_events_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- static const unsigned char asso_values[] =
-- {
--#if defined (ACE_MVS)
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 15, 0, 10, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 0, 5,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 0, 20, 37, 37, 37, 37, 10, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37,
--#else
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-- 15, 0, 10, 37, 37, 37, 37, 37, 37, 0,
-- 5, 37, 37, 37, 37, 0, 20, 37, 37, 37,
-- 37, 10, 37, 37, 37, 37, 37, 37,
--#endif /* ACE_MVS */
-- };
-- return len + asso_values[str[len - 1]] + asso_values[str[0]];
-+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -40163,7 +40015,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::UsesDefSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_UsesDefSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -40216,7 +40068,7 @@
+ {
+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
+
+- IR::EmitsDefSeq_var _tao_retval;
+ IR_EmitsDefSeq_var _tao_retval;
-+
-+ _tao_retval = _tao_impl->emits_events (
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--const class TAO_operation_db_entry *
--TAO_IR_FactoryDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+void POA_IR::ComponentDef::_get_publishes_events_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- enum
-- {
-- TOTAL_KEYWORDS = 26,
-- MIN_WORD_LENGTH = 4,
-- MAX_WORD_LENGTH = 26,
-- MIN_HASH_VALUE = 4,
-- MAX_HASH_VALUE = 36,
-- HASH_VALUE_RANGE = 33,
-- DUPLICATES = 10
-- };
-+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-
-- static const class TAO_operation_db_entry wordlist[] =
-- {
-- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::FactoryDef::move_skel},
-- {"_is_a", &POA_IR::FactoryDef::_is_a_skel},
-- {"_get_mode", &POA_IR::FactoryDef::_get_mode_skel},
-- {"_set_name", &POA_IR::FactoryDef::_set_name_skel},
-- {"_get_name", &POA_IR::FactoryDef::_get_name_skel},
-- {"_set_mode", &POA_IR::FactoryDef::_set_mode_skel},
-- {"_get_params", &POA_IR::FactoryDef::_get_params_skel},
-- {"_set_params", &POA_IR::FactoryDef::_set_params_skel},
-- {"_get_contexts", &POA_IR::FactoryDef::_get_contexts_skel},
-- {"_set_contexts", &POA_IR::FactoryDef::_set_contexts_skel},
-- {"_get_exceptions", &POA_IR::FactoryDef::_get_exceptions_skel},
-- {"_set_exceptions", &POA_IR::FactoryDef::_set_exceptions_skel},
-- {"_get_version", &POA_IR::FactoryDef::_get_version_skel},
-- {"_set_version", &POA_IR::FactoryDef::_set_version_skel},
-- {"_get_absolute_name", &POA_IR::FactoryDef::_get_absolute_name_skel},
-- {"_get_defined_in", &POA_IR::FactoryDef::_get_defined_in_skel},
-- {"_get_id", &POA_IR::FactoryDef::_get_id_skel},
-- {"_set_id", &POA_IR::FactoryDef::_set_id_skel},
-- {"describe", &POA_IR::FactoryDef::describe_skel},
-- {"_get_result_def", &POA_IR::FactoryDef::_get_result_def_skel},
-- {"_set_result_def", &POA_IR::FactoryDef::_set_result_def_skel},
-- {"_get_def_kind", &POA_IR::FactoryDef::_get_def_kind_skel},
-- {"_get_result", &POA_IR::FactoryDef::_get_result_skel},
-- {"destroy", &POA_IR::FactoryDef::destroy_skel},
-- {"_non_existent", &POA_IR::FactoryDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::FactoryDef::_get_containing_repository_skel},
-- };
-+ IR_PublishesDefSeq_var _tao_retval;
-- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-- {
-- unsigned int key = hash (str, len);
-+ _tao_retval = _tao_impl->publishes_events (
-+ ACE_TRY_ENV
-+ );
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -40243,7 +40095,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::EmitsDefSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_EmitsDefSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -40296,7 +40148,7 @@
+ {
+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
+
+- IR::PublishesDefSeq_var _tao_retval;
++ IR_PublishesDefSeq_var _tao_retval;
-- if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-- {
-- {
-- const class TAO_operation_db_entry *resword;
-+ ACE_CHECK;
-
-- switch (key)
-- {
-- case 4:
-- resword = &wordlist[4]; break;
-- case 5:
-- resword = &wordlist[5]; break;
-- case 9:
-- resword = &wordlist[6];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[7];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[8];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[9];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- return 0;
-- case 11:
-- resword = &wordlist[10];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[11];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- return 0;
-- case 13:
-- resword = &wordlist[12];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[13];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- return 0;
-- case 15:
-- resword = &wordlist[14];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[15];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- return 0;
-- case 17:
-- resword = &wordlist[16];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[17];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- return 0;
-- case 18:
-- resword = &wordlist[18]; break;
-- case 20:
-- resword = &wordlist[19]; break;
-- case 22:
-- resword = &wordlist[20];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[21];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- return 0;
-- case 23:
-- resword = &wordlist[22]; break;
-- case 25:
-- resword = &wordlist[23];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[24];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- return 0;
-- case 28:
-- resword = &wordlist[25]; break;
-- case 31:
-- resword = &wordlist[26]; break;
-- case 32:
-- resword = &wordlist[27]; break;
-- case 33:
-- resword = &wordlist[28]; break;
-- case 36:
-- resword = &wordlist[29]; break;
-- default: return 0;
-- }
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1))
-- return resword;
-- return 0;
-- }
-- }
-- }
-- return 0;
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
--/* ending time is 16:31:13 */
--static TAO_IR_FactoryDef_Perfect_Hash_OpTable tao_IR_FactoryDef_optable;
-
-+void POA_IR::ComponentDef::_get_consumes_events_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -40323,7 +40175,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::PublishesDefSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_PublishesDefSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -40376,7 +40228,7 @@
+ {
+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
+
+- IR::ConsumesDefSeq_var _tao_retval;
+ IR_ConsumesDefSeq_var _tao_retval;
-+
-+ _tao_retval = _tao_impl->consumes_events (
-+ ACE_TRY_ENV
-+ );
-
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Implementation
--//
-+ ACE_CHECK;
--// Factory function Implementation.
--POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker *POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::the_TAO_FactoryDef_Strategized_Proxy_Broker (void)
--{
-- static POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker strategized_proxy_broker;
-- return &strategized_proxy_broker;
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::_TAO_FactoryDef_Strategized_Proxy_Broker (void)
-+void POA_IR::ComponentDef::_get_is_basic_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- this->proxy_cache_[i] = 0;
--
--}
-+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-
--POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::~_TAO_FactoryDef_Strategized_Proxy_Broker (void)
--{
-- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-- delete this->proxy_cache_[i];
--
-+ CORBA::Boolean _tao_retval = 0;
-+
-+ _tao_retval = _tao_impl->is_basic (
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--IR::_TAO_FactoryDef_Proxy_Impl&
--POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::FactoryDef *object,
-+void POA_IR::ComponentDef::create_provides_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-- TAO_ORB_Core::collocation_strategy (object);
--
-- if (this->proxy_cache_[strategy] != 0)
-- return *this->proxy_cache_[strategy];
--
-- this->create_proxy (strategy, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
--
-- return *this->proxy_cache_[strategy];
--
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -40403,7 +40255,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ConsumesDefSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_ConsumesDefSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -40536,11 +40388,11 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
+
+- IR::ProvidesDef_var _tao_retval;
+ IR_ProvidesDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
+- IR::InterfaceDef_var interface_type;
+ IR_InterfaceDef_var interface_type;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> interface_type.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_retval = _tao_impl->create_provides (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ interface_type.in (),
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void
--POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::create_proxy (
-- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-+void POA_IR::ComponentDef::create_uses_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
-- )
-+)
- {
-- ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
--
-- if (this->proxy_cache_[strategy] == 0)
-- {
-- switch (strategy)
-- {
-- case TAO_ORB_Core::THRU_POA_STRATEGY:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- POA_IR::_TAO_FactoryDef_ThruPOA_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- case TAO_ORB_Core::REMOTE_STRATEGY:
-- default:
-- ACE_NEW_THROW_EX (
-- this->proxy_cache_[strategy],
-- ::IR::_TAO_FactoryDef_Remote_Proxy_Impl,
-- CORBA::NO_MEMORY ()
-- );
-- ACE_CHECK;
-- break;
--
-- }
--
-- }
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-
+ if (!(
+ (_tao_in >> id.out ()) &&
+ (_tao_in >> name.out ()) &&
+@@ -40549,7 +40401,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -40583,7 +40434,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ProvidesDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_ProvidesDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -40637,11 +40488,11 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
+
+- IR::UsesDef_var _tao_retval;
+ IR_UsesDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
+- IR::InterfaceDef_var interface_type;
+ IR_InterfaceDef_var interface_type;
-+ CORBA::Boolean is_multiple;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> interface_type.out ()) &&
-+ (_tao_in >> CORBA::Any::to_boolean (is_multiple))
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--//
--// End Strategized Proxy Broker Implementation
--///////////////////////////////////////////////////////////////////////
-+ _tao_retval = _tao_impl->create_uses (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ interface_type.in (),
-+ is_multiple,
-+ ACE_TRY_ENV
-+ );
-
-+ ACE_CHECK;
-
--IR::_TAO_FactoryDef_Proxy_Broker *
--IR__TAO_FactoryDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
--{
-- ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::the_TAO_FactoryDef_Strategized_Proxy_Broker();
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--int
--IR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+void POA_IR::ComponentDef::create_emits_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- ACE_UNUSED_ARG (_dummy_);
--
-- IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_FactoryDef_Proxy_Broker_Factory_function;
--
-- return 0;
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-
--static int IR__TAO_FactoryDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer));
+ CORBA::Boolean is_multiple;
+ if (!(
+ (_tao_in >> id.out ()) &&
+@@ -40652,7 +40503,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -40688,7 +40538,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::UsesDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_UsesDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -40742,11 +40592,11 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
+
+- IR::EmitsDef_var _tao_retval;
+ IR_EmitsDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
+- IR::ValueDef_var value;
+ IR_ValueDef_var value;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> value.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
-+ _tao_retval = _tao_impl->create_emits (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ value.in (),
-+ ACE_TRY_ENV
-+ );
-
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Proxy Implementation
--//
-+ ACE_CHECK;
-
--POA_IR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_TAO_FactoryDef_ThruPOA_Proxy_Impl (void)
--{}
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+}
-
--// ThruPOA Implementation of the IDL interface methods
-+void POA_IR::ComponentDef::create_publishes_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-
--//
--// End ThruPOA Proxy Implementation
--///////////////////////////////////////////////////////////////////////
+ if (!(
+ (_tao_in >> id.out ()) &&
+ (_tao_in >> name.out ()) &&
+@@ -40755,7 +40605,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -40789,7 +40638,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::EmitsDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_EmitsDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -40843,11 +40692,11 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
+
+- IR::PublishesDef_var _tao_retval;
+ IR_PublishesDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
+- IR::ValueDef_var value;
+ IR_ValueDef_var value;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> value.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--// skeleton constructor
--POA_IR::FactoryDef::FactoryDef (void)
--{
-- this->optable_ = &tao_IR_FactoryDef_optable;
-+ _tao_retval = _tao_impl->create_publishes (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ value.in (),
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--// copy ctor
--POA_IR::FactoryDef::FactoryDef (const FactoryDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,OperationDef) (rhs),
-- ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-- TAO_ServantBase (rhs)
--{}
-+void POA_IR::ComponentDef::create_consumes_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-+
+ if (!(
+ (_tao_in >> id.out ()) &&
+ (_tao_in >> name.out ()) &&
+@@ -40856,7 +40705,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -40890,7 +40738,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::PublishesDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_PublishesDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -40944,11 +40792,11 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
+
+- IR::ConsumesDef_var _tao_retval;
+ IR_ConsumesDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
+- IR::ValueDef_var value;
+ IR_ValueDef_var value;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> value.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_retval = _tao_impl->create_consumes (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ value.in (),
-+ ACE_TRY_ENV
-+ );
-
--// skeleton destructor
--POA_IR::FactoryDef::~FactoryDef (void)
--{
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void POA_IR::FactoryDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::ComponentDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::FactoryDef *_tao_impl = (POA_IR::FactoryDef *) _tao_object_reference;
-+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *) _tao_object_reference;
+ if (!(
+ (_tao_in >> id.out ()) &&
+ (_tao_in >> name.out ()) &&
+@@ -40957,7 +40805,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -40991,7 +40838,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ConsumesDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_ConsumesDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -41046,7 +40893,7 @@
+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *) _tao_object_reference;
CORBA::Boolean _tao_retval = 0;
CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
ACE_THROW (CORBA::MARSHAL ());
--
-+
+
_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -41054,7 +40901,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -54425,21 +9858,8 @@
ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::FactoryDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::ComponentDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::FactoryDef *_tao_impl = (POA_IR::FactoryDef *) _tao_object_reference;
-+ POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *) _tao_object_reference;
- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -41071,7 +40918,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -54447,658 +9867,238 @@
ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Boolean POA_IR::FactoryDef::_is_a (
-+CORBA::Boolean POA_IR::ComponentDef::_is_a (
- const char* value,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
- if (
-- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FactoryDef:1.0")) ||
-- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/OperationDef:1.0")) ||
-+ (!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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
- return 1;
-@@ -43556,35 +22131,39 @@
- return 0;
- }
-
--void* POA_IR::FactoryDef::_downcast (
-+void* POA_IR::ComponentDef::_downcast (
- const char* logical_type_id
- )
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/FactoryDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::FactoryDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/OperationDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::OperationDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ComponentDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::ComponentDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/InterfaceDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::InterfaceDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Container_ptr, this);
- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
- return ACE_static_cast (POA_IR::Contained_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-+ return ACE_static_cast (POA_IR::IDLType_ptr, this);
+@@ -41108,7 +40955,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
+ return ACE_static_cast (POA_IR::IDLType_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
- }
-
--void POA_IR::FactoryDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::ComponentDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--const char* POA_IR::FactoryDef::_interface_repository_id (void) const
-+const char* POA_IR::ComponentDef::_interface_repository_id (void) const
- {
-- return "IDL:omg.org/IR/FactoryDef:1.0";
-+ return "IDL:omg.org/IR/ComponentDef:1.0";
- }
-
--IR::FactoryDef*
--POA_IR::FactoryDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+IR::ComponentDef*
-+POA_IR::ComponentDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-@@ -43597,116 +22176,111 @@
+@@ -41138,10 +40985,9 @@
ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
CORBA::Object_var obj = tmp;
-- return ::IR::FactoryDef::_unchecked_narrow (obj.in ());
+- return ::IR::ComponentDef::_unchecked_narrow (obj.in ());
+ return IR_ComponentDef::_unchecked_narrow (obj.in ());
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_FinderDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+class TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -41221,7 +41067,7 @@
+ POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set (
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::ComponentDef *tao_impl,
+- const IR::InterfaceDefSeq & supported_interfaces,
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -41823,7 +41669,7 @@
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::InterfaceDef_ptr interface_type,
++ IR_InterfaceDef_ptr interface_type,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -41929,7 +41775,7 @@
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::InterfaceDef_ptr interface_type,
++ IR_InterfaceDef_ptr interface_type,
+ const CORBA::Boolean & is_multiple,
+ CORBA::Environment &
+ )
+@@ -42042,7 +41888,7 @@
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr value,
++ IR_ValueDef_ptr value,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -42148,7 +41994,7 @@
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr value,
++ IR_ValueDef_ptr value,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -42254,7 +42100,7 @@
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr value,
++ IR_ValueDef_ptr value,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -42355,6 +42201,7 @@
+ }
+
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
private:
- unsigned int hash (const char *str, unsigned int len);
+@@ -42362,7 +42209,7 @@
public:
const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
};
--/* starting time is 16:31:13 */
+-/* starting time is 18:47:29 */
+/* starting time is 11:23:11 */
/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FinderDef_Perfect_Hash_OpTable -N lookup */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable -N lookup */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable -N lookup */
unsigned int
--TAO_IR_FinderDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
- static const unsigned char asso_values[] =
- {
- #if defined (ACE_MVS)
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-- 37, 37, 15, 0, 10, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 0, 5,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 0, 20, 37, 37, 37, 37, 10, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 0,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 0,
-+ 32, 32, 0, 0, 32, 32, 32, 10, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 0, 5,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 10, 32, 32, 32, 32, 5, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32,
- #else
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-- 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-- 15, 0, 10, 37, 37, 37, 37, 37, 37, 0,
-- 5, 37, 37, 37, 37, 0, 20, 37, 37, 37,
-- 37, 10, 37, 37, 37, 37, 37, 37,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-+ 32, 32, 32, 32, 32, 0, 32, 0, 32, 32,
-+ 0, 0, 32, 32, 32, 10, 32, 32, 32, 0,
-+ 5, 32, 32, 32, 32, 32, 10, 32, 32, 32,
-+ 32, 5, 32, 32, 32, 32, 32, 32,
- #endif /* ACE_MVS */
- };
- return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
- const class TAO_operation_db_entry *
--TAO_IR_FinderDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
- enum
- {
-- TOTAL_KEYWORDS = 26,
-+ TOTAL_KEYWORDS = 17,
- MIN_WORD_LENGTH = 4,
- MAX_WORD_LENGTH = 26,
- MIN_HASH_VALUE = 4,
-- MAX_HASH_VALUE = 36,
-- HASH_VALUE_RANGE = 33,
-- DUPLICATES = 10
-+ MAX_HASH_VALUE = 31,
-+ HASH_VALUE_RANGE = 28,
-+ DUPLICATES = 4
- };
-
- static const class TAO_operation_db_entry wordlist[] =
- {
- {"",0},{"",0},{"",0},{"",0},
-- {"move", &POA_IR::FinderDef::move_skel},
-- {"_is_a", &POA_IR::FinderDef::_is_a_skel},
-- {"_get_mode", &POA_IR::FinderDef::_get_mode_skel},
-- {"_set_name", &POA_IR::FinderDef::_set_name_skel},
-- {"_get_name", &POA_IR::FinderDef::_get_name_skel},
-- {"_set_mode", &POA_IR::FinderDef::_set_mode_skel},
-- {"_get_params", &POA_IR::FinderDef::_get_params_skel},
-- {"_set_params", &POA_IR::FinderDef::_set_params_skel},
-- {"_get_contexts", &POA_IR::FinderDef::_get_contexts_skel},
-- {"_set_contexts", &POA_IR::FinderDef::_set_contexts_skel},
-- {"_get_exceptions", &POA_IR::FinderDef::_get_exceptions_skel},
-- {"_set_exceptions", &POA_IR::FinderDef::_set_exceptions_skel},
-- {"_get_version", &POA_IR::FinderDef::_get_version_skel},
-- {"_set_version", &POA_IR::FinderDef::_set_version_skel},
-- {"_get_absolute_name", &POA_IR::FinderDef::_get_absolute_name_skel},
-- {"_get_defined_in", &POA_IR::FinderDef::_get_defined_in_skel},
-- {"_get_id", &POA_IR::FinderDef::_get_id_skel},
-- {"_set_id", &POA_IR::FinderDef::_set_id_skel},
-- {"describe", &POA_IR::FinderDef::describe_skel},
-- {"_get_result_def", &POA_IR::FinderDef::_get_result_def_skel},
-- {"_set_result_def", &POA_IR::FinderDef::_set_result_def_skel},
-- {"_get_def_kind", &POA_IR::FinderDef::_get_def_kind_skel},
-- {"_get_result", &POA_IR::FinderDef::_get_result_skel},
-- {"destroy", &POA_IR::FinderDef::destroy_skel},
-- {"_non_existent", &POA_IR::FinderDef::_non_existent_skel},
-- {"_get_containing_repository", &POA_IR::FinderDef::_get_containing_repository_skel},
-+ {"move", &POA_IR::PrimaryKeyDef::move_skel},
-+ {"_is_a", &POA_IR::PrimaryKeyDef::_is_a_skel},
-+ {"_get_id", &POA_IR::PrimaryKeyDef::_get_id_skel},
-+ {"_set_id", &POA_IR::PrimaryKeyDef::_set_id_skel},
-+ {"describe", &POA_IR::PrimaryKeyDef::describe_skel},
-+ {"_get_name", &POA_IR::PrimaryKeyDef::_get_name_skel},
-+ {"_set_name", &POA_IR::PrimaryKeyDef::_set_name_skel},
-+ {"destroy", &POA_IR::PrimaryKeyDef::destroy_skel},
-+ {"_get_def_kind", &POA_IR::PrimaryKeyDef::_get_def_kind_skel},
-+ {"is_a", &POA_IR::PrimaryKeyDef::is_a_skel},
-+ {"_get_version", &POA_IR::PrimaryKeyDef::_get_version_skel},
-+ {"_set_version", &POA_IR::PrimaryKeyDef::_set_version_skel},
-+ {"_get_absolute_name", &POA_IR::PrimaryKeyDef::_get_absolute_name_skel},
-+ {"_get_defined_in", &POA_IR::PrimaryKeyDef::_get_defined_in_skel},
-+ {"_get_primary_key", &POA_IR::PrimaryKeyDef::_get_primary_key_skel},
-+ {"_non_existent", &POA_IR::PrimaryKeyDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::PrimaryKeyDef::_get_containing_repository_skel},
-+ };
-+
-+ static const signed char lookup[] =
-+ {
-+ -6, -2, -9, -2, 4, 5, -1, -38, 8, -38, -1, -1, 11, 12,
-+ 13, -14, -2, -33, 16, -1, 17, 18, -1, 19, -1, -1, -1, -1,
-+ -1, -1, -1, 20,
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -43715,119 +22289,62 @@
-
- if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
- {
-+ int slot = lookup[key];
-+
-+ if (slot >= 0 && slot < MAX_HASH_VALUE)
- {
-- const class TAO_operation_db_entry *resword;
-+ const char *s = wordlist[slot].opname_;
-
-- switch (key)
-- {
-- case 4:
-- resword = &wordlist[4]; break;
-- case 5:
-- resword = &wordlist[5]; break;
-- case 9:
-- resword = &wordlist[6];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[7];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[8];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[9];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- return 0;
-- case 11:
-- resword = &wordlist[10];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[11];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- return 0;
-- case 13:
-- resword = &wordlist[12];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[13];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- return 0;
-- case 15:
-- resword = &wordlist[14];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[15];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- return 0;
-- case 17:
-- resword = &wordlist[16];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[17];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- return 0;
-- case 18:
-- resword = &wordlist[18]; break;
-- case 20:
-- resword = &wordlist[19]; break;
-- case 22:
-- resword = &wordlist[20];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[21];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- return 0;
-- case 23:
-- resword = &wordlist[22]; break;
-- case 25:
-- resword = &wordlist[23];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- resword = &wordlist[24];
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-- return 0;
-- case 28:
-- resword = &wordlist[25]; break;
-- case 31:
-- resword = &wordlist[26]; break;
-- case 32:
-- resword = &wordlist[27]; break;
-- case 33:
-- resword = &wordlist[28]; break;
-- case 36:
-- resword = &wordlist[29]; break;
-- default: return 0;
-- }
-- if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1))
-- return resword;
-- return 0;
-+ if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-+ return &wordlist[slot];
-+ }
-+ else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-+ return 0;
-+ else
-+ {
-+ unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-+ const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-+ const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
-+
-+ while (--ptr >= base)
-+ if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-+ return ptr;
- }
- }
+@@ -42490,10 +42337,9 @@
}
return 0;
}
--/* ending time is 16:31:13 */
--static TAO_IR_FinderDef_Perfect_Hash_OpTable tao_IR_FinderDef_optable;
--
+-/* ending time is 18:47:29 */
+/* ending time is 11:23:11 */
-+static TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable tao_IR_PrimaryKeyDef_optable;
+ static TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable tao_IR_PrimaryKeyDef_optable;
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Implementation
//
-
- // Factory function Implementation.
--POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker *POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::the_TAO_FinderDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker *POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::the_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void)
- {
-- static POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ static POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker strategized_proxy_broker;
- return &strategized_proxy_broker;
- }
-
--POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::_TAO_FinderDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- this->proxy_cache_[i] = 0;
-
- }
-
--POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::~_TAO_FinderDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::~_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- delete this->proxy_cache_[i];
+@@ -42519,9 +42365,9 @@
}
--IR::_TAO_FinderDef_Proxy_Impl&
--POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::FinderDef *object,
+-IR::_TAO_PrimaryKeyDef_Proxy_Impl&
+_TAO_PrimaryKeyDef_Proxy_Impl&
-+POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::select_proxy (
+ POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::PrimaryKeyDef *object,
+ IR_PrimaryKeyDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -43845,7 +22362,7 @@
- }
-
- void
--POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::create_proxy (
-+POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::create_proxy (
- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -43859,7 +22376,7 @@
+@@ -42553,7 +42399,7 @@
case TAO_ORB_Core::THRU_POA_STRATEGY:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
-- POA_IR::_TAO_FinderDef_ThruPOA_Proxy_Impl,
+- POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl,
+ _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -43869,7 +22386,7 @@
+@@ -42563,7 +42409,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
-- ::IR::_TAO_FinderDef_Remote_Proxy_Impl,
+- ::IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl,
+ _TAO_PrimaryKeyDef_Remote_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -43886,108 +22403,230 @@
+@@ -42580,26 +42426,26 @@
///////////////////////////////////////////////////////////////////////
--IR::_TAO_FinderDef_Proxy_Broker *
--IR__TAO_FinderDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+-IR::_TAO_PrimaryKeyDef_Proxy_Broker *
+-IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_PrimaryKeyDef_Proxy_Broker *
+_TAO_PrimaryKeyDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::the_TAO_FinderDef_Strategized_Proxy_Broker();
-+ return ::POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::the_TAO_PrimaryKeyDef_Strategized_Proxy_Broker();
+ return ::POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::the_TAO_PrimaryKeyDef_Strategized_Proxy_Broker();
}
int
--IR__TAO_FinderDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+-IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_PrimaryKeyDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
ACE_UNUSED_ARG (_dummy_);
-- IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_FinderDef_Proxy_Broker_Factory_function;
+- IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function;
+ _TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer =
+ _TAO_PrimaryKeyDef_Proxy_Broker_Factory_function;
return 0;
}
--static int IR__TAO_FinderDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_FinderDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_FinderDef_Proxy_Broker_Factory_Initializer));
+-static int IR__TAO_PrimaryKeyDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_PrimaryKeyDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+ _TAO_PrimaryKeyDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_PrimaryKeyDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
- // ThruPOA Proxy Implementation
- //
-
--POA_IR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_TAO_FinderDef_ThruPOA_Proxy_Impl (void)
-+POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::~_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl (void)
- {}
-
- // ThruPOA Implementation of the IDL interface methods
-
-+CORBA::Boolean POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::is_a (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * primary_key_id,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+ CORBA::Boolean _tao_retval = 0;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "is_a",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (_tao_retval);
-+ return ACE_reinterpret_cast (
-+ POA_IR::PrimaryKeyDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/PrimaryKeyDef:1.0"
-+ )
-+ )->is_a (
-+ primary_key_id,
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+IR::ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+ IR_ValueDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "primary_key",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::PrimaryKeyDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/PrimaryKeyDef:1.0"
-+ )
-+ )->primary_key (
-+ ACE_TRY_ENV
-+ );
-+}
-+
- //
- // End ThruPOA Proxy Implementation
- ///////////////////////////////////////////////////////////////////////
-
- // skeleton constructor
--POA_IR::FinderDef::FinderDef (void)
-+POA_IR::PrimaryKeyDef::PrimaryKeyDef (void)
- {
-- this->optable_ = &tao_IR_FinderDef_optable;
-+ this->optable_ = &tao_IR_PrimaryKeyDef_optable;
+@@ -42644,7 +42490,7 @@
+ );
}
+-IR::ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key (
++IR_ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -42652,7 +42498,7 @@
+ CORBA::SystemException
+ ))
+ {
+- IR::ValueDef_var _tao_retval;
++ IR_ValueDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -42688,7 +42534,7 @@
// copy ctor
--POA_IR::FinderDef::FinderDef (const FinderDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,OperationDef) (rhs),
-- ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ POA_IR::PrimaryKeyDef::PrimaryKeyDef (const PrimaryKeyDef& rhs)
+ : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+POA_IR::PrimaryKeyDef::PrimaryKeyDef (const PrimaryKeyDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ POA_CORBA_IRObject (rhs),
TAO_ServantBase (rhs)
{}
- // skeleton destructor
--POA_IR::FinderDef::~FinderDef (void)
-+POA_IR::PrimaryKeyDef::~PrimaryKeyDef (void)
- {
- }
-
--void POA_IR::FinderDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::PrimaryKeyDef::is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *)_tao_object_reference;
-+
-+ CORBA::Boolean _tao_retval = 0;
-+ CORBA::String_var primary_key_id;
-+ if (!(
-+ (_tao_in >> primary_key_id.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+
-+ _tao_retval = _tao_impl->is_a (
-+ primary_key_id.in (),
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+}
-+
-+void POA_IR::PrimaryKeyDef::_get_primary_key_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *)_tao_object_reference;
-+
-+ IR_ValueDef_var _tao_retval;
-+
-+ _tao_retval = _tao_impl->primary_key (
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-+}
-+
-+void POA_IR::PrimaryKeyDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
+@@ -42714,7 +42560,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -42794,7 +42639,7 @@
{
- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::FinderDef *_tao_impl = (POA_IR::FinderDef *) _tao_object_reference;
-+ POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *) _tao_object_reference;
+ POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *)_tao_object_reference;
+
+- IR::ValueDef_var _tao_retval;
++ IR_ValueDef_var _tao_retval;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -42821,7 +42666,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -42876,7 +42721,7 @@
+ POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *) _tao_object_reference;
CORBA::Boolean _tao_retval = 0;
CORBA::String_var value;
- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
ACE_THROW (CORBA::MARSHAL ());
--
-+
+
_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -42884,7 +42729,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -55106,21 +10106,8 @@
ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::FinderDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-+void POA_IR::PrimaryKeyDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
- void * _tao_object_reference,
- void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::FinderDef *_tao_impl = (POA_IR::FinderDef *) _tao_object_reference;
-+ POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *) _tao_object_reference;
- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
- ACE_CHECK;
--
-+
+@@ -42901,7 +42746,7 @@
+
_tao_server_request.init_reply ();
TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
@@ -55128,34 +10115,7 @@
ACE_THROW (CORBA::MARSHAL ());
}
--CORBA::Boolean POA_IR::FinderDef::_is_a (
-+CORBA::Boolean POA_IR::PrimaryKeyDef::_is_a (
- const char* value,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
- if (
-- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FinderDef:1.0")) ||
-- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/OperationDef:1.0")) ||
-+ (!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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-@@ -43996,35 +22635,33 @@
- return 0;
- }
-
--void* POA_IR::FinderDef::_downcast (
-+void* POA_IR::PrimaryKeyDef::_downcast (
- const char* logical_type_id
- )
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/FinderDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::FinderDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/OperationDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::OperationDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/PrimaryKeyDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::PrimaryKeyDef_ptr, this);
+@@ -42929,7 +42774,7 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
return ACE_static_cast (POA_IR::Contained_ptr, this);
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
@@ -55164,3810 +10124,843 @@
if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
return ACE_static_cast(PortableServer::Servant, this);
return 0;
- }
-
--void POA_IR::FinderDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_IR::PrimaryKeyDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--const char* POA_IR::FinderDef::_interface_repository_id (void) const
-+const char* POA_IR::PrimaryKeyDef::_interface_repository_id (void) const
- {
-- return "IDL:omg.org/IR/FinderDef:1.0";
-+ return "IDL:omg.org/IR/PrimaryKeyDef:1.0";
- }
-
--IR::FinderDef*
--POA_IR::FinderDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+IR::PrimaryKeyDef*
-+POA_IR::PrimaryKeyDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-@@ -44037,150 +22674,113 @@
+@@ -42959,10 +42804,9 @@
ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
CORBA::Object_var obj = tmp;
-- return ::IR::FinderDef::_unchecked_narrow (obj.in ());
+- return ::IR::PrimaryKeyDef::_unchecked_narrow (obj.in ());
+ return IR_PrimaryKeyDef::_unchecked_narrow (obj.in ());
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
--#endif /* TAO_HAS_INTERCEPTORS */
--class TAO_IR_HomeDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+class TAO_IR_FactoryDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a (
+ TAO_ServerRequest &_tao_server_request,
+@@ -43124,6 +42968,7 @@
+ }
+
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_FactoryDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
private:
- unsigned int hash (const char *str, unsigned int len);
+@@ -43131,7 +42976,7 @@
public:
const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
};
--/* starting time is 16:31:13 */
+-/* starting time is 18:47:29 */
+/* starting time is 11:23:11 */
/* C++ code produced by gperf version 2.8 (ACE version) */
--/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_HomeDef_Perfect_Hash_OpTable -N lookup */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FactoryDef_Perfect_Hash_OpTable -N lookup */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FactoryDef_Perfect_Hash_OpTable -N lookup */
unsigned int
--TAO_IR_HomeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+TAO_IR_FactoryDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
- {
- static const unsigned char asso_values[] =
- {
- #if defined (ACE_MVS)
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 0,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 0,
-- 89, 15, 0, 45, 89, 89, 89, 0, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 5, 0, 10,
-- 89, 0, 89, 5, 89, 89, 89, 89, 89, 89,
-- 89, 89, 15, 30, 89, 89, 89, 0, 55, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 15, 0, 10, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 0, 5,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 0, 20, 37, 37, 37, 37, 10, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37,
- #else
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-- 89, 89, 89, 89, 89, 0, 89, 0, 89, 15,
-- 0, 45, 89, 89, 89, 0, 89, 89, 5, 0,
-- 10, 89, 0, 89, 5, 15, 30, 89, 89, 89,
-- 0, 55, 89, 89, 89, 89, 89, 89,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-+ 15, 0, 10, 37, 37, 37, 37, 37, 37, 0,
-+ 5, 37, 37, 37, 37, 0, 20, 37, 37, 37,
-+ 37, 10, 37, 37, 37, 37, 37, 37,
- #endif /* ACE_MVS */
- };
- return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
- const class TAO_operation_db_entry *
--TAO_IR_HomeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+TAO_IR_FactoryDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
- enum
- {
-- TOTAL_KEYWORDS = 49,
-+ TOTAL_KEYWORDS = 26,
- MIN_WORD_LENGTH = 4,
- MAX_WORD_LENGTH = 26,
- MIN_HASH_VALUE = 4,
-- MAX_HASH_VALUE = 88,
-- HASH_VALUE_RANGE = 85,
-- DUPLICATES = 11
-+ MAX_HASH_VALUE = 36,
-+ HASH_VALUE_RANGE = 33,
-+ DUPLICATES = 10
- };
-
- static const class TAO_operation_db_entry wordlist[] =
- {
- {"",0},{"",0},{"",0},{"",0},
-- {"is_a", &POA_IR::HomeDef::is_a_skel},
-- {"_is_a", &POA_IR::HomeDef::_is_a_skel},
-- {"_get_id", &POA_IR::HomeDef::_get_id_skel},
-- {"_set_id", &POA_IR::HomeDef::_set_id_skel},
-- {"lookup", &POA_IR::HomeDef::lookup_skel},
-- {"_get_def_kind", &POA_IR::HomeDef::_get_def_kind_skel},
-- {"_get_is_local", &POA_IR::HomeDef::_get_is_local_skel},
-- {"_set_is_local", &POA_IR::HomeDef::_set_is_local_skel},
-- {"_get_version", &POA_IR::HomeDef::_get_version_skel},
-- {"_set_version", &POA_IR::HomeDef::_set_version_skel},
-- {"_get_defined_in", &POA_IR::HomeDef::_get_defined_in_skel},
-- {"create_enum", &POA_IR::HomeDef::create_enum_skel},
-- {"_get_finders", &POA_IR::HomeDef::_get_finders_skel},
-- {"_get_is_basic", &POA_IR::HomeDef::_get_is_basic_skel},
-- {"_get_factories", &POA_IR::HomeDef::_get_factories_skel},
-- {"create_value_box", &POA_IR::HomeDef::create_value_box_skel},
-- {"describe_contents", &POA_IR::HomeDef::describe_contents_skel},
-- {"create_finder", &POA_IR::HomeDef::create_finder_skel},
-- {"_get_base_interfaces", &POA_IR::HomeDef::_get_base_interfaces_skel},
-- {"_set_base_interfaces", &POA_IR::HomeDef::_set_base_interfaces_skel},
-- {"create_union", &POA_IR::HomeDef::create_union_skel},
-- {"contents", &POA_IR::HomeDef::contents_skel},
-- {"create_operation", &POA_IR::HomeDef::create_operation_skel},
-- {"create_exception", &POA_IR::HomeDef::create_exception_skel},
-- {"create_alias", &POA_IR::HomeDef::create_alias_skel},
-- {"_non_existent", &POA_IR::HomeDef::_non_existent_skel},
-- {"_get_is_abstract", &POA_IR::HomeDef::_get_is_abstract_skel},
-- {"_set_is_abstract", &POA_IR::HomeDef::_set_is_abstract_skel},
-- {"move", &POA_IR::HomeDef::move_skel},
-- {"_get_managed_component", &POA_IR::HomeDef::_get_managed_component_skel},
-- {"describe", &POA_IR::HomeDef::describe_skel},
-- {"_get_name", &POA_IR::HomeDef::_get_name_skel},
-- {"_get_type", &POA_IR::HomeDef::_get_type_skel},
-- {"_set_name", &POA_IR::HomeDef::_set_name_skel},
-- {"create_struct", &POA_IR::HomeDef::create_struct_skel},
-- {"_get_base_home", &POA_IR::HomeDef::_get_base_home_skel},
-- {"create_constant", &POA_IR::HomeDef::create_constant_skel},
-- {"lookup_name", &POA_IR::HomeDef::lookup_name_skel},
-- {"destroy", &POA_IR::HomeDef::destroy_skel},
-- {"_get_absolute_name", &POA_IR::HomeDef::_get_absolute_name_skel},
-- {"_get_primary_key", &POA_IR::HomeDef::_get_primary_key_skel},
-- {"create_value", &POA_IR::HomeDef::create_value_skel},
-- {"create_module", &POA_IR::HomeDef::create_module_skel},
-- {"create_native", &POA_IR::HomeDef::create_native_skel},
-- {"create_attribute", &POA_IR::HomeDef::create_attribute_skel},
-- {"create_interface", &POA_IR::HomeDef::create_interface_skel},
-- {"_get_containing_repository", &POA_IR::HomeDef::_get_containing_repository_skel},
-- {"create_factory", &POA_IR::HomeDef::create_factory_skel},
-- {"create_primary_key", &POA_IR::HomeDef::create_primary_key_skel},
-- };
--
-- static const signed char lookup[] =
-- {
-- -1, -1, -6, -2, 4, 5, -1, -93, -1, -1, -1, 8, -1, 9,
-- -1, -1, -10, -2, -90, -1, -12, -2, -90, -22, -2, 14, 15, 16,
-- 17, 18, -1, 19, 20, 21, -1, -100, -1, 24, 25, -26, -2, -90,
-- 28, 29, -30, -2, -90, -1, -1, 32, -35, -3, 33, 34, -92, -1,
-- -1, -1, 38, 39, 40, 41, 42, 43, -1, -1, -1, -1, -1, -46,
-- -2, 44, 45, -92, -48, -2, -90, -1, -1, -1, -1, 50, -1, -1,
-- 51, -1, -1, -1, 52,
-+ {"move", &POA_IR::FactoryDef::move_skel},
-+ {"_is_a", &POA_IR::FactoryDef::_is_a_skel},
-+ {"_get_mode", &POA_IR::FactoryDef::_get_mode_skel},
-+ {"_set_name", &POA_IR::FactoryDef::_set_name_skel},
-+ {"_get_name", &POA_IR::FactoryDef::_get_name_skel},
-+ {"_set_mode", &POA_IR::FactoryDef::_set_mode_skel},
-+ {"_get_params", &POA_IR::FactoryDef::_get_params_skel},
-+ {"_set_params", &POA_IR::FactoryDef::_set_params_skel},
-+ {"_get_contexts", &POA_IR::FactoryDef::_get_contexts_skel},
-+ {"_set_contexts", &POA_IR::FactoryDef::_set_contexts_skel},
-+ {"_get_exceptions", &POA_IR::FactoryDef::_get_exceptions_skel},
-+ {"_set_exceptions", &POA_IR::FactoryDef::_set_exceptions_skel},
-+ {"_get_version", &POA_IR::FactoryDef::_get_version_skel},
-+ {"_set_version", &POA_IR::FactoryDef::_set_version_skel},
-+ {"_get_absolute_name", &POA_IR::FactoryDef::_get_absolute_name_skel},
-+ {"_get_defined_in", &POA_IR::FactoryDef::_get_defined_in_skel},
-+ {"_get_id", &POA_IR::FactoryDef::_get_id_skel},
-+ {"_set_id", &POA_IR::FactoryDef::_set_id_skel},
-+ {"describe", &POA_IR::FactoryDef::describe_skel},
-+ {"_get_result_def", &POA_IR::FactoryDef::_get_result_def_skel},
-+ {"_set_result_def", &POA_IR::FactoryDef::_set_result_def_skel},
-+ {"_get_def_kind", &POA_IR::FactoryDef::_get_def_kind_skel},
-+ {"_get_result", &POA_IR::FactoryDef::_get_result_skel},
-+ {"destroy", &POA_IR::FactoryDef::destroy_skel},
-+ {"_non_existent", &POA_IR::FactoryDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::FactoryDef::_get_containing_repository_skel},
- };
-
- if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -44189,63 +22789,118 @@
-
- if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
- {
-- int slot = lookup[key];
--
-- if (slot >= 0 && slot < MAX_HASH_VALUE)
-- {
-- const char *s = wordlist[slot].opname_;
--
-- if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-- return &wordlist[slot];
-- }
-- else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-- return 0;
-- else
- {
-- unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-- const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-- const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
-+ const class TAO_operation_db_entry *resword;
-
-- while (--ptr >= base)
-- if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-- return ptr;
-+ switch (key)
-+ {
-+ case 4:
-+ resword = &wordlist[4]; break;
-+ case 5:
-+ resword = &wordlist[5]; break;
-+ case 9:
-+ resword = &wordlist[6];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[7];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[8];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[9];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ return 0;
-+ case 11:
-+ resword = &wordlist[10];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[11];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ return 0;
-+ case 13:
-+ resword = &wordlist[12];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[13];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ return 0;
-+ case 15:
-+ resword = &wordlist[14];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[15];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ return 0;
-+ case 17:
-+ resword = &wordlist[16];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[17];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ return 0;
-+ case 18:
-+ resword = &wordlist[18]; break;
-+ case 20:
-+ resword = &wordlist[19]; break;
-+ case 22:
-+ resword = &wordlist[20];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[21];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ return 0;
-+ case 23:
-+ resword = &wordlist[22]; break;
-+ case 25:
-+ resword = &wordlist[23];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[24];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ return 0;
-+ case 28:
-+ resword = &wordlist[25]; break;
-+ case 31:
-+ resword = &wordlist[26]; break;
-+ case 32:
-+ resword = &wordlist[27]; break;
-+ case 33:
-+ resword = &wordlist[28]; break;
-+ case 36:
-+ resword = &wordlist[29]; break;
-+ default: return 0;
-+ }
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1))
-+ return resword;
-+ return 0;
- }
- }
+@@ -43317,10 +43162,9 @@
}
return 0;
}
--/* ending time is 16:31:13 */
--static TAO_IR_HomeDef_Perfect_Hash_OpTable tao_IR_HomeDef_optable;
--
+-/* ending time is 18:47:29 */
+/* ending time is 11:23:11 */
-+static TAO_IR_FactoryDef_Perfect_Hash_OpTable tao_IR_FactoryDef_optable;
+ static TAO_IR_FactoryDef_Perfect_Hash_OpTable tao_IR_FactoryDef_optable;
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Implementation
//
-
- // Factory function Implementation.
--POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker *POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::the_TAO_HomeDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker *POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::the_TAO_FactoryDef_Strategized_Proxy_Broker (void)
- {
-- static POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ static POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker strategized_proxy_broker;
- return &strategized_proxy_broker;
- }
-
--POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::_TAO_HomeDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::_TAO_FactoryDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- this->proxy_cache_[i] = 0;
+@@ -43346,9 +43190,9 @@
}
--POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::~_TAO_HomeDef_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::~_TAO_FactoryDef_Strategized_Proxy_Broker (void)
- {
- for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
- delete this->proxy_cache_[i];
-
- }
-
--IR::_TAO_HomeDef_Proxy_Impl&
--POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::select_proxy (
-- ::IR::HomeDef *object,
+-IR::_TAO_FactoryDef_Proxy_Impl&
+_TAO_FactoryDef_Proxy_Impl&
-+POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::select_proxy (
+ POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::FactoryDef *object,
+ IR_FactoryDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -44263,7 +22918,7 @@
- }
-
- void
--POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::create_proxy (
-+POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::create_proxy (
- TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -44277,7 +22932,7 @@
+@@ -43380,7 +43224,7 @@
case TAO_ORB_Core::THRU_POA_STRATEGY:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
-- POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl,
+- POA_IR::_TAO_FactoryDef_ThruPOA_Proxy_Impl,
+ _TAO_FactoryDef_ThruPOA_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -44287,7 +22942,7 @@
+@@ -43390,7 +43234,7 @@
default:
ACE_NEW_THROW_EX (
this->proxy_cache_[strategy],
-- ::IR::_TAO_HomeDef_Remote_Proxy_Impl,
+- ::IR::_TAO_FactoryDef_Remote_Proxy_Impl,
+ _TAO_FactoryDef_Remote_Proxy_Impl,
CORBA::NO_MEMORY ()
);
ACE_CHECK;
-@@ -44304,2049 +22959,1610 @@
+@@ -43407,26 +43251,26 @@
///////////////////////////////////////////////////////////////////////
--IR::_TAO_HomeDef_Proxy_Broker *
--IR__TAO_HomeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+-IR::_TAO_FactoryDef_Proxy_Broker *
+-IR__TAO_FactoryDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_FactoryDef_Proxy_Broker *
+_TAO_FactoryDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
{
ACE_UNUSED_ARG (obj);
-- return ::POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::the_TAO_HomeDef_Strategized_Proxy_Broker();
-+ return ::POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::the_TAO_FactoryDef_Strategized_Proxy_Broker();
+ return ::POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::the_TAO_FactoryDef_Strategized_Proxy_Broker();
}
int
--IR__TAO_HomeDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+-IR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_FactoryDef_Proxy_Broker_Factory_Initializer (long _dummy_)
{
ACE_UNUSED_ARG (_dummy_);
-- IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer =
-- IR__TAO_HomeDef_Proxy_Broker_Factory_function;
+- IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_FactoryDef_Proxy_Broker_Factory_function;
+ _TAO_FactoryDef_Proxy_Broker_Factory_function_pointer =
+ _TAO_FactoryDef_Proxy_Broker_Factory_function;
return 0;
}
--static int IR__TAO_HomeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-- IR__TAO_HomeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_HomeDef_Proxy_Broker_Factory_Initializer));
+-static int IR__TAO_FactoryDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_FactoryDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+ _TAO_FactoryDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_FactoryDef_Proxy_Broker_Factory_Initializer));
///////////////////////////////////////////////////////////////////////
- // ThruPOA Proxy Implementation
- //
-
--POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_TAO_HomeDef_ThruPOA_Proxy_Impl (void)
-+POA_IR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_TAO_FactoryDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::~_TAO_FactoryDef_ThruPOA_Proxy_Impl (void)
+@@ -43452,7 +43296,7 @@
+ POA_IR::FactoryDef::FactoryDef (const FactoryDef& rhs)
+ : ACE_NESTED_CLASS (POA_IR,OperationDef) (rhs),
+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
++ POA_CORBA_IRObject (rhs),
+ TAO_ServantBase (rhs)
{}
- // ThruPOA Implementation of the IDL interface methods
-
--IR::HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home (
-- CORBA_Object *_collocated_tao_target_,
-+//
-+// End ThruPOA Proxy Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-+// skeleton constructor
-+POA_IR::FactoryDef::FactoryDef (void)
-+{
-+ this->optable_ = &tao_IR_FactoryDef_optable;
-+}
-+
-+// copy ctor
-+POA_IR::FactoryDef::FactoryDef (const FactoryDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,OperationDef) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-+ POA_CORBA_IRObject (rhs),
-+ TAO_ServantBase (rhs)
-+{}
-+
-+// skeleton destructor
-+POA_IR::FactoryDef::~FactoryDef (void)
-+{
-+}
-+
-+void POA_IR::FactoryDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
- {
-- IR::HomeDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "base_home",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::HomeDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/HomeDef:1.0"
-- )
-- )->base_home (
-- ACE_TRY_ENV
-- );
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::FactoryDef *_tao_impl = (POA_IR::FactoryDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = 0;
-+ CORBA::String_var value;
+@@ -43472,7 +43316,7 @@
+ POA_IR::FactoryDef *_tao_impl = (POA_IR::FactoryDef *) _tao_object_reference;
+ CORBA::Boolean _tao_retval = 0;
+ CORBA::String_var value;
+- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
-+ ACE_THROW (CORBA::MARSHAL ());
-+
-+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+ ACE_THROW (CORBA::MARSHAL ());
+
+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+@@ -43480,7 +43324,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
-+}
-+
-+void POA_IR::FactoryDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+{
-+ POA_IR::FactoryDef *_tao_impl = (POA_IR::FactoryDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+ ACE_THROW (CORBA::MARSHAL ());
+ }
+
+@@ -43497,7 +43341,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
-+}
-+
-+CORBA::Boolean POA_IR::FactoryDef::_is_a (
-+ const char* value,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+{
-+ if (
-+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FactoryDef:1.0")) ||
-+ (!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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-+ return 1;
-+ else
-+ return 0;
-+}
-+
-+void* POA_IR::FactoryDef::_downcast (
-+ const char* logical_type_id
-+ )
-+{
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/FactoryDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::FactoryDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/OperationDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::OperationDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Contained_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-+ return ACE_static_cast(PortableServer::Servant, this);
-+ return 0;
-+}
-+
-+void POA_IR::FactoryDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+{
-+ this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
-+}
-+
-+const char* POA_IR::FactoryDef::_interface_repository_id (void) const
-+{
-+ return "IDL:omg.org/IR/FactoryDef:1.0";
+ ACE_THROW (CORBA::MARSHAL ());
}
--IR::ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+IR::FactoryDef*
-+POA_IR::FactoryDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
-- IR::ComponentDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "managed_component",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::HomeDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/HomeDef:1.0"
-- )
-- )->managed_component (
-- ACE_TRY_ENV
-- );
-+ TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (0);
-+
-+ CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-+
-+ if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-+ else
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-+
-+ CORBA::Object_var obj = tmp;
+@@ -43528,7 +43372,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
+ return ACE_static_cast (POA_IR::Contained_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
++ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+ return ACE_static_cast(PortableServer::Servant, this);
+ return 0;
+@@ -43558,12 +43402,12 @@
+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
+
+ CORBA::Object_var obj = tmp;
+- return ::IR::FactoryDef::_unchecked_narrow (obj.in ());
+ return IR_FactoryDef::_unchecked_narrow (obj.in ());
}
--IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+class TAO_IR_FinderDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ #endif /* TAO_HAS_INTERCEPTORS */
++
+ class TAO_IR_FinderDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
{
-- IR::PrimaryKeyDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "primary_key",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::HomeDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/HomeDef:1.0"
-- )
-- )->primary_key (
-- ACE_TRY_ENV
-- );
-+private:
-+ unsigned int hash (const char *str, unsigned int len);
-+public:
-+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-+};
+ private:
+@@ -43571,7 +43415,7 @@
+ public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 18:47:29 */
+/* starting time is 11:23:11 */
-+/* C++ code produced by gperf version 2.8 (ACE version) */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FinderDef_Perfect_Hash_OpTable -N lookup */
-+unsigned int
-+TAO_IR_FinderDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+{
-+ static const unsigned char asso_values[] =
-+ {
-+#if defined (ACE_MVS)
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 0,
-+ 37, 37, 15, 0, 10, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 0, 5,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 0, 20, 37, 37, 37, 37, 10, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37,
-+#else
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-+ 37, 37, 37, 37, 37, 0, 37, 0, 37, 37,
-+ 15, 0, 10, 37, 37, 37, 37, 37, 37, 0,
-+ 5, 37, 37, 37, 37, 0, 20, 37, 37, 37,
-+ 37, 10, 37, 37, 37, 37, 37, 37,
-+#endif /* ACE_MVS */
-+ };
-+ return len + asso_values[str[len - 1]] + asso_values[str[0]];
- }
-
--IR::FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+const class TAO_operation_db_entry *
-+TAO_IR_FinderDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
- {
-- IR::FactoryDefSeq_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "factories",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::HomeDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/HomeDef:1.0"
-- )
-- )->factories (
-- ACE_TRY_ENV
-- );
-+ enum
-+ {
-+ TOTAL_KEYWORDS = 26,
-+ MIN_WORD_LENGTH = 4,
-+ MAX_WORD_LENGTH = 26,
-+ MIN_HASH_VALUE = 4,
-+ MAX_HASH_VALUE = 36,
-+ HASH_VALUE_RANGE = 33,
-+ DUPLICATES = 10
-+ };
-+
-+ static const class TAO_operation_db_entry wordlist[] =
-+ {
-+ {"",0},{"",0},{"",0},{"",0},
-+ {"move", &POA_IR::FinderDef::move_skel},
-+ {"_is_a", &POA_IR::FinderDef::_is_a_skel},
-+ {"_get_mode", &POA_IR::FinderDef::_get_mode_skel},
-+ {"_set_name", &POA_IR::FinderDef::_set_name_skel},
-+ {"_get_name", &POA_IR::FinderDef::_get_name_skel},
-+ {"_set_mode", &POA_IR::FinderDef::_set_mode_skel},
-+ {"_get_params", &POA_IR::FinderDef::_get_params_skel},
-+ {"_set_params", &POA_IR::FinderDef::_set_params_skel},
-+ {"_get_contexts", &POA_IR::FinderDef::_get_contexts_skel},
-+ {"_set_contexts", &POA_IR::FinderDef::_set_contexts_skel},
-+ {"_get_exceptions", &POA_IR::FinderDef::_get_exceptions_skel},
-+ {"_set_exceptions", &POA_IR::FinderDef::_set_exceptions_skel},
-+ {"_get_version", &POA_IR::FinderDef::_get_version_skel},
-+ {"_set_version", &POA_IR::FinderDef::_set_version_skel},
-+ {"_get_absolute_name", &POA_IR::FinderDef::_get_absolute_name_skel},
-+ {"_get_defined_in", &POA_IR::FinderDef::_get_defined_in_skel},
-+ {"_get_id", &POA_IR::FinderDef::_get_id_skel},
-+ {"_set_id", &POA_IR::FinderDef::_set_id_skel},
-+ {"describe", &POA_IR::FinderDef::describe_skel},
-+ {"_get_result_def", &POA_IR::FinderDef::_get_result_def_skel},
-+ {"_set_result_def", &POA_IR::FinderDef::_set_result_def_skel},
-+ {"_get_def_kind", &POA_IR::FinderDef::_get_def_kind_skel},
-+ {"_get_result", &POA_IR::FinderDef::_get_result_skel},
-+ {"destroy", &POA_IR::FinderDef::destroy_skel},
-+ {"_non_existent", &POA_IR::FinderDef::_non_existent_skel},
-+ {"_get_containing_repository", &POA_IR::FinderDef::_get_containing_repository_skel},
-+ };
-+
-+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-+ {
-+ unsigned int key = hash (str, len);
-+
-+ if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-+ {
-+ {
-+ const class TAO_operation_db_entry *resword;
-+
-+ switch (key)
-+ {
-+ case 4:
-+ resword = &wordlist[4]; break;
-+ case 5:
-+ resword = &wordlist[5]; break;
-+ case 9:
-+ resword = &wordlist[6];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[7];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[8];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[9];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ return 0;
-+ case 11:
-+ resword = &wordlist[10];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[11];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ return 0;
-+ case 13:
-+ resword = &wordlist[12];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[13];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ return 0;
-+ case 15:
-+ resword = &wordlist[14];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[15];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ return 0;
-+ case 17:
-+ resword = &wordlist[16];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[17];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ return 0;
-+ case 18:
-+ resword = &wordlist[18]; break;
-+ case 20:
-+ resword = &wordlist[19]; break;
-+ case 22:
-+ resword = &wordlist[20];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[21];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ return 0;
-+ case 23:
-+ resword = &wordlist[22]; break;
-+ case 25:
-+ resword = &wordlist[23];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ resword = &wordlist[24];
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-+ return 0;
-+ case 28:
-+ resword = &wordlist[25]; break;
-+ case 31:
-+ resword = &wordlist[26]; break;
-+ case 32:
-+ resword = &wordlist[27]; break;
-+ case 33:
-+ resword = &wordlist[28]; break;
-+ case 36:
-+ resword = &wordlist[29]; break;
-+ default: return 0;
-+ }
-+ if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1))
-+ return resword;
-+ return 0;
-+ }
-+ }
-+ }
-+ return 0;
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FinderDef_Perfect_Hash_OpTable -N lookup */
+ unsigned int
+@@ -43757,10 +43601,9 @@
+ }
+ return 0;
}
+-/* ending time is 18:47:29 */
+/* ending time is 11:23:11 */
-+static TAO_IR_FinderDef_Perfect_Hash_OpTable tao_IR_FinderDef_optable;
-
--IR::FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Implementation
-+//
-+
-+// Factory function Implementation.
-+POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker *POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::the_TAO_FinderDef_Strategized_Proxy_Broker (void)
- {
-- IR::FinderDefSeq_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "finders",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::HomeDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/HomeDef:1.0"
-- )
-- )->finders (
-- ACE_TRY_ENV
-- );
-+ static POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ return &strategized_proxy_broker;
- }
-
--CORBA::Boolean POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::is_basic (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::_TAO_FinderDef_Strategized_Proxy_Broker (void)
- {
-- CORBA::Boolean _tao_retval = 0;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "is_basic",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
-- return ACE_reinterpret_cast (
-- POA_IR::HomeDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/HomeDef:1.0"
-- )
-- )->is_basic (
-- ACE_TRY_ENV
-- );
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ this->proxy_cache_[i] = 0;
-+
- }
+ static TAO_IR_FinderDef_Perfect_Hash_OpTable tao_IR_FinderDef_optable;
--IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::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
-- ))
-+POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::~_TAO_FinderDef_Strategized_Proxy_Broker (void)
- {
-- IR::PrimaryKeyDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_primary_key",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::HomeDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/HomeDef:1.0"
-- )
-- )->create_primary_key (
-- id,
-- name,
-- version,
-- primary_key,
-- ACE_TRY_ENV
-- );
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ delete this->proxy_cache_[i];
-+
+-
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Implementation
+ //
+@@ -43786,9 +43629,9 @@
+
}
--IR::FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_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,
+-IR::_TAO_FinderDef_Proxy_Impl&
+_TAO_FinderDef_Proxy_Impl&
-+POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::select_proxy (
+ POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::FinderDef *object,
+ IR_FinderDef *object,
CORBA::Environment &ACE_TRY_ENV
)
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
{
-- IR::FactoryDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_factory",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::HomeDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/HomeDef:1.0"
-- )
-- )->create_factory (
-- id,
-- name,
-- version,
-- params,
-- exceptions,
-- ACE_TRY_ENV
-- );
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-+ TAO_ORB_Core::collocation_strategy (object);
-+
-+ if (this->proxy_cache_[strategy] != 0)
-+ return *this->proxy_cache_[strategy];
-+
-+ this->create_proxy (strategy, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-+
-+ return *this->proxy_cache_[strategy];
-+
- }
-
--IR::FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_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,
-+void
-+POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::create_proxy (
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy,
- CORBA::Environment &ACE_TRY_ENV
- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
- {
-- IR::FinderDef_var _tao_retval;
-- ACE_UNUSED_ARG (_tao_retval);
-- TAO_Object_Adapter::Servant_Upcall servant_upcall (
-- _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-- );
-- CORBA::Object_var forward_to;
-- servant_upcall.prepare_for_upcall (
-- _collocated_tao_target_->_object_key (),
-- "create_finder",
-- forward_to.out (),
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
-- return ACE_reinterpret_cast (
-- POA_IR::HomeDef_ptr,
-- servant_upcall.servant ()->_downcast (
-- "IDL:omg.org/IR/HomeDef:1.0"
-- )
-- )->create_finder (
-- id,
-- name,
-- version,
-- params,
-- exceptions,
-- ACE_TRY_ENV
-- );
-+ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-+
-+ if (this->proxy_cache_[strategy] == 0)
-+ {
-+ switch (strategy)
-+ {
-+ case TAO_ORB_Core::THRU_POA_STRATEGY:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+@@ -43820,7 +43663,7 @@
+ case TAO_ORB_Core::THRU_POA_STRATEGY:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- POA_IR::_TAO_FinderDef_ThruPOA_Proxy_Impl,
+ _TAO_FinderDef_ThruPOA_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ case TAO_ORB_Core::REMOTE_STRATEGY:
-+ default:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -43830,7 +43673,7 @@
+ default:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- ::IR::_TAO_FinderDef_Remote_Proxy_Impl,
+ _TAO_FinderDef_Remote_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ }
-+
-+ }
-+}
-+
-+
-+//
-+// End Strategized Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-+
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -43847,26 +43690,26 @@
+ ///////////////////////////////////////////////////////////////////////
+
+
+-IR::_TAO_FinderDef_Proxy_Broker *
+-IR__TAO_FinderDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_FinderDef_Proxy_Broker *
+_TAO_FinderDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+{
-+ ACE_UNUSED_ARG (obj);
-+ return ::POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::the_TAO_FinderDef_Strategized_Proxy_Broker();
-+}
-+
-+int
+ {
+ ACE_UNUSED_ARG (obj);
+ return ::POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::the_TAO_FinderDef_Strategized_Proxy_Broker();
+ }
+
+ int
+-IR__TAO_FinderDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_FinderDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+{
-+ ACE_UNUSED_ARG (_dummy_);
-+
+ {
+ ACE_UNUSED_ARG (_dummy_);
+
+- IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_FinderDef_Proxy_Broker_Factory_function;
+ _TAO_FinderDef_Proxy_Broker_Factory_function_pointer =
+ _TAO_FinderDef_Proxy_Broker_Factory_function;
-+
-+ return 0;
+
+ return 0;
}
+-static int IR__TAO_FinderDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_FinderDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_FinderDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_FinderDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+ _TAO_FinderDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_FinderDef_Proxy_Broker_Factory_Initializer));
-+
-+
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Proxy Implementation
-+//
-+
-+POA_IR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_TAO_FinderDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_FinderDef_ThruPOA_Proxy_Impl::~_TAO_FinderDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+// ThruPOA Implementation of the IDL interface methods
-+
- //
- // End ThruPOA Proxy Implementation
- ///////////////////////////////////////////////////////////////////////
- // skeleton constructor
--POA_IR::HomeDef::HomeDef (void)
-+POA_IR::FinderDef::FinderDef (void)
- {
-- this->optable_ = &tao_IR_HomeDef_optable;
-+ this->optable_ = &tao_IR_FinderDef_optable;
- }
--
--// copy ctor
--POA_IR::HomeDef::HomeDef (const HomeDef& rhs)
-- : ACE_NESTED_CLASS (POA_IR,InterfaceDef) (rhs),
-- ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-+
-+// copy ctor
-+POA_IR::FinderDef::FinderDef (const FinderDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,OperationDef) (rhs),
+
+ ///////////////////////////////////////////////////////////////////////
+@@ -43892,7 +43735,7 @@
+ POA_IR::FinderDef::FinderDef (const FinderDef& rhs)
+ : ACE_NESTED_CLASS (POA_IR,OperationDef) (rhs),
ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-- ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+ POA_CORBA_IRObject (rhs),
TAO_ServantBase (rhs)
{}
- // skeleton destructor
--POA_IR::HomeDef::~HomeDef (void)
-+POA_IR::FinderDef::~FinderDef (void)
- {
- }
-
--void POA_IR::HomeDef::_get_base_home_skel (
-+void POA_IR::FinderDef::_is_a_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void * _tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
--
-- IR::HomeDef_var _tao_retval;
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::FinderDef *_tao_impl = (POA_IR::FinderDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = 0;
-+ CORBA::String_var value;
+@@ -43912,7 +43755,7 @@
+ POA_IR::FinderDef *_tao_impl = (POA_IR::FinderDef *) _tao_object_reference;
+ CORBA::Boolean _tao_retval = 0;
+ CORBA::String_var value;
+- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
-+ ACE_THROW (CORBA::MARSHAL ());
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->base_home (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::HomeDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+ ACE_THROW (CORBA::MARSHAL ());
+
+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+@@ -43920,7 +43763,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (CORBA::MARSHAL ());
}
--void POA_IR::HomeDef::_get_managed_component_skel (
-+void POA_IR::FinderDef::_non_existent_skel (
- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+ void * _tao_object_reference,
-+ void * /* context */,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
-+ POA_IR::FinderDef *_tao_impl = (POA_IR::FinderDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-+ ACE_CHECK;
-
-- IR::ComponentDef_var _tao_retval;
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+@@ -43937,7 +43780,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
-+}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
-+CORBA::Boolean POA_IR::FinderDef::_is_a (
-+ const char* value,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+{
-+ if (
-+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FinderDef:1.0")) ||
-+ (!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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-+ return 1;
-+ else
-+ return 0;
-+}
-+
-+void* POA_IR::FinderDef::_downcast (
-+ const char* logical_type_id
-+ )
-+{
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/FinderDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::FinderDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/OperationDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::OperationDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Contained_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+ ACE_THROW (CORBA::MARSHAL ());
+ }
+
+@@ -43968,7 +43811,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
+ return ACE_static_cast (POA_IR::Contained_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-+ return ACE_static_cast(PortableServer::Servant, this);
-+ return 0;
-+}
-+
-+void POA_IR::FinderDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+{
-+ this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
-+}
-+
-+const char* POA_IR::FinderDef::_interface_repository_id (void) const
-+{
-+ return "IDL:omg.org/IR/FinderDef:1.0";
-+}
-+
-+IR::FinderDef*
-+POA_IR::FinderDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+{
-+ TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (0);
-
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->managed_component (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::ComponentDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-+ CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-+
-+ if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-+ else
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-+
-+ CORBA::Object_var obj = tmp;
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+ return ACE_static_cast(PortableServer::Servant, this);
+ return 0;
+@@ -43998,12 +43841,12 @@
+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
+
+ CORBA::Object_var obj = tmp;
+- return ::IR::FinderDef::_unchecked_narrow (obj.in ());
+ return IR_FinderDef::_unchecked_narrow (obj.in ());
-+}
+ }
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ #endif /* TAO_HAS_INTERCEPTORS */
+
-+class TAO_IR_HomeDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
-+{
-+private:
-+ unsigned int hash (const char *str, unsigned int len);
-+public:
-+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-+};
+ class TAO_IR_HomeDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
+ {
+ private:
+@@ -44011,7 +43854,7 @@
+ public:
+ const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 18:47:29 */
+/* starting time is 11:23:11 */
-+/* C++ code produced by gperf version 2.8 (ACE version) */
-+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_HomeDef_Perfect_Hash_OpTable -N lookup */
-+unsigned int
-+TAO_IR_HomeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-+{
-+ static const unsigned char asso_values[] =
- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-+#if defined (ACE_MVS)
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 0,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 0,
-+ 89, 15, 0, 45, 89, 89, 89, 0, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 5, 0, 10,
-+ 89, 0, 89, 5, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 15, 30, 89, 89, 89, 0, 55, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89,
-+#else
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
-+ 89, 89, 89, 89, 89, 0, 89, 0, 89, 15,
-+ 0, 45, 89, 89, 89, 0, 89, 89, 5, 0,
-+ 10, 89, 0, 89, 5, 15, 30, 89, 89, 89,
-+ 0, 55, 89, 89, 89, 89, 89, 89,
-+#endif /* ACE_MVS */
-+ };
-+ return len + asso_values[str[len - 1]] + asso_values[str[0]];
-+}
-+
-+const class TAO_operation_db_entry *
-+TAO_IR_HomeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-+{
-+ enum
-+ {
-+ TOTAL_KEYWORDS = 49,
-+ MIN_WORD_LENGTH = 4,
-+ MAX_WORD_LENGTH = 26,
-+ MIN_HASH_VALUE = 4,
-+ MAX_HASH_VALUE = 88,
-+ HASH_VALUE_RANGE = 85,
-+ DUPLICATES = 11
-+ };
-+
-+ static const class TAO_operation_db_entry wordlist[] =
-+ {
-+ {"",0},{"",0},{"",0},{"",0},
-+ {"is_a", &POA_IR::HomeDef::is_a_skel},
-+ {"_is_a", &POA_IR::HomeDef::_is_a_skel},
-+ {"_get_id", &POA_IR::HomeDef::_get_id_skel},
-+ {"_set_id", &POA_IR::HomeDef::_set_id_skel},
-+ {"lookup", &POA_IR::HomeDef::lookup_skel},
-+ {"_get_def_kind", &POA_IR::HomeDef::_get_def_kind_skel},
-+ {"_get_is_local", &POA_IR::HomeDef::_get_is_local_skel},
-+ {"_set_is_local", &POA_IR::HomeDef::_set_is_local_skel},
-+ {"_get_version", &POA_IR::HomeDef::_get_version_skel},
-+ {"_set_version", &POA_IR::HomeDef::_set_version_skel},
-+ {"_get_defined_in", &POA_IR::HomeDef::_get_defined_in_skel},
-+ {"create_enum", &POA_IR::HomeDef::create_enum_skel},
-+ {"_get_finders", &POA_IR::HomeDef::_get_finders_skel},
-+ {"_get_is_basic", &POA_IR::HomeDef::_get_is_basic_skel},
-+ {"_get_factories", &POA_IR::HomeDef::_get_factories_skel},
-+ {"create_value_box", &POA_IR::HomeDef::create_value_box_skel},
-+ {"describe_contents", &POA_IR::HomeDef::describe_contents_skel},
-+ {"create_finder", &POA_IR::HomeDef::create_finder_skel},
-+ {"_get_base_interfaces", &POA_IR::HomeDef::_get_base_interfaces_skel},
-+ {"_set_base_interfaces", &POA_IR::HomeDef::_set_base_interfaces_skel},
-+ {"create_union", &POA_IR::HomeDef::create_union_skel},
-+ {"contents", &POA_IR::HomeDef::contents_skel},
-+ {"create_operation", &POA_IR::HomeDef::create_operation_skel},
-+ {"create_exception", &POA_IR::HomeDef::create_exception_skel},
-+ {"create_alias", &POA_IR::HomeDef::create_alias_skel},
-+ {"_non_existent", &POA_IR::HomeDef::_non_existent_skel},
-+ {"_get_is_abstract", &POA_IR::HomeDef::_get_is_abstract_skel},
-+ {"_set_is_abstract", &POA_IR::HomeDef::_set_is_abstract_skel},
-+ {"move", &POA_IR::HomeDef::move_skel},
-+ {"_get_managed_component", &POA_IR::HomeDef::_get_managed_component_skel},
-+ {"describe", &POA_IR::HomeDef::describe_skel},
-+ {"_get_name", &POA_IR::HomeDef::_get_name_skel},
-+ {"_get_type", &POA_IR::HomeDef::_get_type_skel},
-+ {"_set_name", &POA_IR::HomeDef::_set_name_skel},
-+ {"create_struct", &POA_IR::HomeDef::create_struct_skel},
-+ {"_get_base_home", &POA_IR::HomeDef::_get_base_home_skel},
-+ {"create_constant", &POA_IR::HomeDef::create_constant_skel},
-+ {"lookup_name", &POA_IR::HomeDef::lookup_name_skel},
-+ {"destroy", &POA_IR::HomeDef::destroy_skel},
-+ {"_get_absolute_name", &POA_IR::HomeDef::_get_absolute_name_skel},
-+ {"_get_primary_key", &POA_IR::HomeDef::_get_primary_key_skel},
-+ {"create_value", &POA_IR::HomeDef::create_value_skel},
-+ {"create_module", &POA_IR::HomeDef::create_module_skel},
-+ {"create_native", &POA_IR::HomeDef::create_native_skel},
-+ {"create_attribute", &POA_IR::HomeDef::create_attribute_skel},
-+ {"create_interface", &POA_IR::HomeDef::create_interface_skel},
-+ {"_get_containing_repository", &POA_IR::HomeDef::_get_containing_repository_skel},
-+ {"create_factory", &POA_IR::HomeDef::create_factory_skel},
-+ {"create_primary_key", &POA_IR::HomeDef::create_primary_key_skel},
-+ };
-+
-+ static const signed char lookup[] =
-+ {
-+ -1, -1, -6, -2, 4, 5, -1, -93, -1, -1, -1, 8, -1, 9,
-+ -1, -1, -10, -2, -90, -1, -12, -2, -90, -22, -2, 14, 15, 16,
-+ 17, 18, -1, 19, 20, 21, -1, -100, -1, 24, 25, -26, -2, -90,
-+ 28, 29, -30, -2, -90, -1, -1, 32, -35, -3, 33, 34, -92, -1,
-+ -1, -1, 38, 39, 40, 41, 42, 43, -1, -1, -1, -1, -1, -46,
-+ -2, 44, 45, -92, -48, -2, -90, -1, -1, -1, -1, 50, -1, -1,
-+ 51, -1, -1, -1, 52,
-+ };
-+
-+ if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ unsigned int key = hash (str, len);
-+
-+ if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-+ {
-+ int slot = lookup[key];
-+
-+ if (slot >= 0 && slot < MAX_HASH_VALUE)
-+ {
-+ const char *s = wordlist[slot].opname_;
-+
-+ if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-+ return &wordlist[slot];
-+ }
-+ else if (slot < 0 && slot >= -MAX_HASH_VALUE)
-+ return 0;
-+ else
-+ {
-+ unsigned int offset = key + slot + (slot > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-+ const class TAO_operation_db_entry *base = &wordlist[-lookup[offset]];
-+ const class TAO_operation_db_entry *ptr = base + -lookup[offset + 1];
-+
-+ while (--ptr >= base)
-+ if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-+ return ptr;
-+ }
-+ }
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_HomeDef_Perfect_Hash_OpTable -N lookup */
+ unsigned int
+@@ -44175,10 +44018,9 @@
}
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
-+ return 0;
-+}
+ return 0;
+ }
+-/* ending time is 18:47:29 */
+/* ending time is 11:23:11 */
-+static TAO_IR_HomeDef_Perfect_Hash_OpTable tao_IR_HomeDef_optable;
-+
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Implementation
-+//
-+
-+// Factory function Implementation.
-+POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker *POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::the_TAO_HomeDef_Strategized_Proxy_Broker (void)
-+{
-+ static POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker strategized_proxy_broker;
-+ return &strategized_proxy_broker;
-+}
-+
-+POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::_TAO_HomeDef_Strategized_Proxy_Broker (void)
-+{
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ this->proxy_cache_[i] = 0;
-
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
-+}
-
-+POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::~_TAO_HomeDef_Strategized_Proxy_Broker (void)
-+{
-+ for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-+ delete this->proxy_cache_[i];
-+
- }
-
--void POA_IR::HomeDef::_get_primary_key_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+_TAO_HomeDef_Proxy_Impl&
-+POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::select_proxy (
-+ IR_HomeDef *object,
- CORBA::Environment &ACE_TRY_ENV
- )
- {
-- POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
--
-- IR::PrimaryKeyDef_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy =
-+ TAO_ORB_Core::collocation_strategy (object);
-
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->primary_key (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::PrimaryKeyDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
-+ if (this->proxy_cache_[strategy] != 0)
-+ return *this->proxy_cache_[strategy];
-+
-+ this->create_proxy (strategy, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-+
-+ return *this->proxy_cache_[strategy];
-
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
+ static TAO_IR_HomeDef_Perfect_Hash_OpTable tao_IR_HomeDef_optable;
+
-
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Implementation
+ //
+@@ -44204,9 +44046,9 @@
+
}
--void POA_IR::HomeDef::_get_factories_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+void
-+POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::create_proxy (
-+ TAO_ORB_Core::TAO_Collocation_Strategies strategy,
+-IR::_TAO_HomeDef_Proxy_Impl&
++_TAO_HomeDef_Proxy_Impl&
+ POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::select_proxy (
+- ::IR::HomeDef *object,
++ IR_HomeDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-- POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
-+ ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-+
-+ if (this->proxy_cache_[strategy] == 0)
-+ {
-+ switch (strategy)
-+ {
-+ case TAO_ORB_Core::THRU_POA_STRATEGY:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+@@ -44238,7 +44080,7 @@
+ case TAO_ORB_Core::THRU_POA_STRATEGY:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl,
+ _TAO_HomeDef_ThruPOA_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ case TAO_ORB_Core::REMOTE_STRATEGY:
-+ default:
-+ ACE_NEW_THROW_EX (
-+ this->proxy_cache_[strategy],
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -44248,7 +44090,7 @@
+ default:
+ ACE_NEW_THROW_EX (
+ this->proxy_cache_[strategy],
+- ::IR::_TAO_HomeDef_Remote_Proxy_Impl,
+ _TAO_HomeDef_Remote_Proxy_Impl,
-+ CORBA::NO_MEMORY ()
-+ );
-+ ACE_CHECK;
-+ break;
-+
-+ }
-+
-+ }
-+}
-
-- IR::FactoryDefSeq_var _tao_retval;
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- ACE_TRY_ENV
-- );
-+//
-+// End Strategized Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-+
+ CORBA::NO_MEMORY ()
+ );
+ ACE_CHECK;
+@@ -44265,26 +44107,26 @@
+ ///////////////////////////////////////////////////////////////////////
+
+
+-IR::_TAO_HomeDef_Proxy_Broker *
+-IR__TAO_HomeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_HomeDef_Proxy_Broker *
+_TAO_HomeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+{
-+ ACE_UNUSED_ARG (obj);
-+ return ::POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::the_TAO_HomeDef_Strategized_Proxy_Broker();
-+}
-+
-+int
+ {
+ ACE_UNUSED_ARG (obj);
+ return ::POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::the_TAO_HomeDef_Strategized_Proxy_Broker();
+ }
+
+ int
+-IR__TAO_HomeDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_HomeDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+{
-+ ACE_UNUSED_ARG (_dummy_);
-
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->factories (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::FactoryDefSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
+ {
+ ACE_UNUSED_ARG (_dummy_);
+
+- IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer =
+- IR__TAO_HomeDef_Proxy_Broker_Factory_function;
+ _TAO_HomeDef_Proxy_Broker_Factory_function_pointer =
+ _TAO_HomeDef_Proxy_Broker_Factory_function;
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
-+ return 0;
+ return 0;
}
--void POA_IR::HomeDef::_get_finders_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
+-static int IR__TAO_HomeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+- IR__TAO_HomeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_HomeDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_HomeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+ _TAO_HomeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_HomeDef_Proxy_Broker_Factory_Initializer));
-+
-+
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Proxy Implementation
-+//
-+
-+POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_TAO_HomeDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::~_TAO_HomeDef_ThruPOA_Proxy_Impl (void)
-+{}
-+
-+// ThruPOA Implementation of the IDL interface methods
-+
-+IR::HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home (
-+ CORBA_Object *_collocated_tao_target_,
+
+
+ ///////////////////////////////////////////////////////////////////////
+@@ -44296,7 +44138,7 @@
+
+ // ThruPOA Implementation of the IDL interface methods
+
+-IR::HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home (
++IR_HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
+@@ -44304,7 +44146,7 @@
+ CORBA::SystemException
+ ))
{
-- POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
--
-- IR::FinderDefSeq_var _tao_retval;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
+- IR::HomeDef_var _tao_retval;
+ IR_HomeDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "base_home",
-+ forward_to.out (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->finders (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::FinderDefSeq * _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::HomeDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/HomeDef:1.0"
-+ )
-+ )->base_home (
- ACE_TRY_ENV
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -44327,7 +44169,7 @@
);
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
}
--void POA_IR::HomeDef::_get_is_basic_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+IR::ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component (
-+ CORBA_Object *_collocated_tao_target_,
+-IR::ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component (
++IR_ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
+@@ -44335,7 +44177,7 @@
+ CORBA::SystemException
+ ))
{
-- POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
--
-- CORBA::Boolean _tao_retval = 0;
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-- );
--
-- POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get ri (
-- _tao_server_request,
-- _tao_impl
-- ,
+- IR::ComponentDef_var _tao_retval;
+ IR_ComponentDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "managed_component",
-+ forward_to.out (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->is_basic (
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- CORBA::Boolean _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::HomeDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/HomeDef:1.0"
-+ )
-+ )->managed_component (
- ACE_TRY_ENV
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -44358,7 +44200,7 @@
);
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
}
--void POA_IR::HomeDef::create_primary_key_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key (
-+ CORBA_Object *_collocated_tao_target_,
+-IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key (
++IR_PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
--
-- IR::PrimaryKeyDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
-- IR::ValueDef_var primary_key;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> primary_key.out ())
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
+@@ -44366,7 +44208,7 @@
+ CORBA::SystemException
))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-+{
+ {
+- IR::PrimaryKeyDef_var _tao_retval;
+ IR_PrimaryKeyDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
--
-- POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- primary_key.in (),
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "primary_key",
-+ forward_to.out (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_primary_key (
-- id.in (),
-- name.in (),
-- version.in (),
-- primary_key.in (),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::PrimaryKeyDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::HomeDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/HomeDef:1.0"
-+ )
-+ )->primary_key (
- ACE_TRY_ENV
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -44389,7 +44231,7 @@
);
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
}
--void POA_IR::HomeDef::create_factory_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
--
-- IR::FactoryDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
-- IR::ParDescriptionSeq params;
-- IR::ExceptionDefSeq exceptions;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> params) &&
-- (_tao_in >> exceptions)
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-+IR::FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
+-IR::FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories (
++IR_FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -44397,7 +44239,7 @@
+ CORBA::SystemException
+ ))
+ {
+- IR::FactoryDefSeq_var _tao_retval;
+ IR_FactoryDefSeq_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
--
-- POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- params,
-- exceptions,
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "factories",
-+ forward_to.out (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_factory (
-- id.in (),
-- name.in (),
-- version.in (),
-- params,
-- exceptions,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::FactoryDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::HomeDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/HomeDef:1.0"
-+ )
-+ )->factories (
- ACE_TRY_ENV
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -44420,7 +44262,7 @@
);
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
}
--void POA_IR::HomeDef::create_finder_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void *_tao_object_reference,
-- void * /* context */,
-+IR::FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders (
-+ CORBA_Object *_collocated_tao_target_,
+-IR::FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders (
++IR_FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
--{
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
--
-- IR::FinderDef_var _tao_retval;
-- CORBA::String_var id;
-- CORBA::String_var name;
-- CORBA::String_var version;
-- IR::ParDescriptionSeq params;
-- IR::ExceptionDefSeq exceptions;
-- if (!(
-- (_tao_in >> id.out ()) &&
-- (_tao_in >> name.out ()) &&
-- (_tao_in >> version.out ()) &&
-- (_tao_in >> params) &&
-- (_tao_in >> exceptions)
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
+@@ -44428,7 +44270,7 @@
+ CORBA::SystemException
))
-- ACE_THROW (CORBA::MARSHAL());
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-- _tao_server_request.orb_core ()->server_request_interceptors (),
-- _tao_server_request.interceptor_count ()
-+{
+ {
+- IR::FinderDefSeq_var _tao_retval;
+ IR_FinderDefSeq_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
- );
--
-- POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder ri (
-- _tao_server_request,
-- _tao_impl
-- ,
-- id.in (),
-- name.in (),
-- version.in (),
-- params,
-- exceptions,
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "finders",
-+ forward_to.out (),
- ACE_TRY_ENV
- );
--
-- ACE_TRY
-- {
-- _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-- _tao_retval =
--
-- _tao_impl->create_finder (
-- id.in (),
-- name.in (),
-- version.in (),
-- params,
-- exceptions,
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- IR::FinderDef_ptr _tao_retval_info = _tao_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_retval = _tao_retval_info;
-- ri.reply_status (PortableInterceptor::SUCCESSFUL);
-- _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- ri.forward_reference (exc);
-- _tao_vfr.send_other (
-- &ri,
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::HomeDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/HomeDef:1.0"
-+ )
-+ )->finders (
- ACE_TRY_ENV
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -44482,19 +44324,19 @@
);
-- ACE_TRY_CHECK;
-- _tao_server_request.forward_location (exc.forward.in ());
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.send_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(
-- (_tao_out << _tao_retval.in ())
-- ))
-- ACE_THROW (CORBA::MARSHAL());
--
}
--void POA_IR::HomeDef::_is_a_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-+CORBA::Boolean POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::is_basic (
-+ CORBA_Object *_collocated_tao_target_,
- CORBA::Environment &ACE_TRY_ENV
- )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-- POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = 0;
-- CORBA::String_var value;
-- if (!(_tao_in >> value.out ()))
-- ACE_THROW (CORBA::MARSHAL ());
--
-- _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
-+ CORBA::Boolean _tao_retval = 0;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "is_basic",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (_tao_retval);
-+ return ACE_reinterpret_cast (
-+ POA_IR::HomeDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/HomeDef:1.0"
-+ )
-+ )->is_basic (
-+ ACE_TRY_ENV
-+ );
- }
-
--void POA_IR::HomeDef::_non_existent_skel (
-- TAO_ServerRequest &_tao_server_request,
-- void * _tao_object_reference,
-- void * /* context */,
-+IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_key (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * id,
-+ const char * name,
-+ const char * version,
+-IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_key (
++IR_PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_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 ((
-+ CORBA::SystemException
-+ ))
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
{
-- POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *) _tao_object_reference;
-- CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-- ACE_CHECK;
--
-- _tao_server_request.init_reply ();
-- TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-- ACE_THROW (CORBA::MARSHAL ());
+- IR::PrimaryKeyDef_var _tao_retval;
+ IR_PrimaryKeyDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_primary_key",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::HomeDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/HomeDef:1.0"
-+ )
-+ )->create_primary_key (
-+ id,
-+ name,
-+ version,
-+ primary_key,
-+ ACE_TRY_ENV
-+ );
- }
-
--CORBA::Boolean POA_IR::HomeDef::_is_a (
-- const char* value,
-+IR::FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -44521,20 +44363,20 @@
+ );
+ }
+
+-IR::FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory (
++IR_FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_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 ((
-+ CORBA::SystemException
-+ ))
- {
-- 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-- return 1;
-- else
-- return 0;
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+- IR::FactoryDef_var _tao_retval;
+ IR_FactoryDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_factory",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::HomeDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/HomeDef:1.0"
-+ )
-+ )->create_factory (
-+ id,
-+ name,
-+ version,
-+ params,
-+ exceptions,
-+ ACE_TRY_ENV
-+ );
- }
-
--void* POA_IR::HomeDef::_downcast (
-- const char* logical_type_id
-+IR::FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -44562,20 +44404,20 @@
+ );
+ }
+
+-IR::FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder (
++IR_FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_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
+ CORBA::Environment &ACE_TRY_ENV
)
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/HomeDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::HomeDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/InterfaceDef:1.0") == 0)
-- return ACE_static_cast (POA_IR::InterfaceDef_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-- return ACE_static_cast (POA_IR::Container_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-- return ACE_static_cast (POA_IR::Contained_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-- return ACE_static_cast (POA_IR::IDLType_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-- if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-- return ACE_static_cast(PortableServer::Servant, this);
-- return 0;
--}
--
--void POA_IR::HomeDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
--{
-- this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
-+ IR_FinderDef_var _tao_retval;
-+ ACE_UNUSED_ARG (_tao_retval);
-+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
-+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-+ );
-+ CORBA::Object_var forward_to;
-+ servant_upcall.prepare_for_upcall (
-+ _collocated_tao_target_->_object_key (),
-+ "create_finder",
-+ forward_to.out (),
-+ ACE_TRY_ENV
-+ );
-+ ACE_CHECK_RETURN (0);
-+ return ACE_reinterpret_cast (
-+ POA_IR::HomeDef_ptr,
-+ servant_upcall.servant ()->_downcast (
-+ "IDL:omg.org/IR/HomeDef:1.0"
-+ )
-+ )->create_finder (
-+ id,
-+ name,
-+ version,
-+ params,
-+ exceptions,
-+ ACE_TRY_ENV
-+ );
- }
-
--const char* POA_IR::HomeDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/HomeDef:1.0";
--}
-+//
-+// End ThruPOA Proxy Implementation
-+///////////////////////////////////////////////////////////////////////
-
--IR::HomeDef*
--POA_IR::HomeDef::_this (CORBA_Environment &ACE_TRY_ENV)
-+// skeleton constructor
-+POA_IR::HomeDef::HomeDef (void)
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
{
-- TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Object_ptr tmp = CORBA::Object::_nil ();
--
-- if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-- else
-- ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
--
-- CORBA::Object_var obj = tmp;
-- return ::IR::HomeDef::_unchecked_narrow (obj.in ());
-+ this->optable_ = &tao_IR_HomeDef_optable;
- }
-
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::TAO_ServerRequestInfo_IR_HomeDef_base_home_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::HomeDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
-+// copy ctor
-+POA_IR::HomeDef::HomeDef (const HomeDef& rhs)
-+ : ACE_NESTED_CLASS (POA_IR,InterfaceDef) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-+ ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+- IR::FinderDef_var _tao_retval;
++ IR_FinderDef_var _tao_retval;
+ ACE_UNUSED_ARG (_tao_retval);
+ TAO_Object_Adapter::Servant_Upcall servant_upcall (
+ _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+@@ -44619,7 +44461,7 @@
+ ACE_NESTED_CLASS (POA_IR,Container) (rhs),
+ ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
+ ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
+- ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+ POA_CORBA_IRObject (rhs),
-+ TAO_ServantBase (rhs)
+ TAO_ServantBase (rhs)
{}
--Dynamic::ParameterList *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+// skeleton destructor
-+POA_IR::HomeDef::~HomeDef (void)
+@@ -44637,7 +44479,7 @@
{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
- }
-
--Dynamic::ExceptionList *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::HomeDef::_get_base_home_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
-
--CORBA::Any *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
+ POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
+
+- IR::HomeDef_var _tao_retval;
+ IR_HomeDef_var _tao_retval;
--char *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ _tao_retval = _tao_impl->base_home (
-+ ACE_TRY_ENV
-+ );
-
--CORBA::Boolean
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+ ACE_CHECK;
-
--void
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (IR::HomeDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get (
-+void POA_IR::HomeDef::_get_managed_component_skel (
- TAO_ServerRequest &_tao_server_request,
-- POA_IR::HomeDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+ POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
-
--Dynamic::ExceptionList *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -44664,7 +44506,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::HomeDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_HomeDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -44717,7 +44559,7 @@
+ {
+ POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
+
+- IR::ComponentDef_var _tao_retval;
+ IR_ComponentDef_var _tao_retval;
--CORBA::Any *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+ _tao_retval = _tao_impl->managed_component (
-+ ACE_TRY_ENV
-+ );
-
--char *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ ACE_CHECK;
-
--CORBA::Boolean
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ ACE_CHECK;
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (IR::ComponentDef_ptr result)
-+void POA_IR::HomeDef::_get_primary_key_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Update the result.
-- this->_result = result;
--}
-+ POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
-
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::HomeDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -44744,7 +44586,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::ComponentDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_ComponentDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -44797,7 +44639,7 @@
+ {
+ POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
+
+- IR::PrimaryKeyDef_var _tao_retval;
+ IR_PrimaryKeyDef_var _tao_retval;
--Dynamic::ParameterList *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+ _tao_retval = _tao_impl->primary_key (
-+ ACE_TRY_ENV
-+ );
-
--Dynamic::ExceptionList *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ ACE_CHECK;
-
--CORBA::Any *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--char *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::HomeDef::_get_factories_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
-
--CORBA::Boolean
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -44824,7 +44666,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::PrimaryKeyDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_PrimaryKeyDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -44877,7 +44719,7 @@
+ {
+ POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
+
+- IR::FactoryDefSeq_var _tao_retval;
+ IR_FactoryDefSeq_var _tao_retval;
--void
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (IR::PrimaryKeyDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
-+ _tao_retval = _tao_impl->factories (
-+ ACE_TRY_ENV
-+ );
-
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get::TAO_ServerRequestInfo_IR_HomeDef_factories_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::HomeDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
-+ ACE_CHECK;
-
--Dynamic::ParameterList *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--Dynamic::ExceptionList *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::HomeDef::_get_finders_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
-
--CORBA::Any *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -44904,7 +44746,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::FactoryDefSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_FactoryDefSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -44957,7 +44799,7 @@
+ {
+ POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
+
+- IR::FinderDefSeq_var _tao_retval;
+ IR_FinderDefSeq_var _tao_retval;
--char *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ _tao_retval = _tao_impl->finders (
-+ ACE_TRY_ENV
-+ );
-
--CORBA::Boolean
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+ ACE_CHECK;
-
--void
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (IR::FactoryDefSeq * result)
--{
-- // Update the result.
-- this->_result = result;
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get::TAO_ServerRequestInfo_IR_HomeDef_finders_get (
-+void POA_IR::HomeDef::_get_is_basic_skel (
- TAO_ServerRequest &_tao_server_request,
-- POA_IR::HomeDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+ POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
-
--Dynamic::ExceptionList *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ CORBA::Boolean _tao_retval = 0;
-+
-+ _tao_retval = _tao_impl->is_basic (
-+ ACE_TRY_ENV
-+ );
-+
-+ ACE_CHECK;
-+
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--CORBA::Any *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::HomeDef::create_primary_key_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
-+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+@@ -44984,7 +44826,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::FinderDefSeq * _tao_retval_info = _tao_retval._retn ();
++ IR_FinderDefSeq * _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -45117,11 +44959,11 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
+
+- IR::PrimaryKeyDef_var _tao_retval;
+ IR_PrimaryKeyDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
+- IR::ValueDef_var primary_key;
+ IR_ValueDef_var primary_key;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> primary_key.out ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--char *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ _tao_retval = _tao_impl->create_primary_key (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ primary_key.in (),
-+ ACE_TRY_ENV
-+ );
-
--CORBA::Boolean
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+ ACE_CHECK;
-
--void
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (IR::FinderDefSeq * result)
--{
-- // Update the result.
-- this->_result = result;
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get (
-+void POA_IR::HomeDef::create_factory_skel (
- TAO_ServerRequest &_tao_server_request,
-- POA_IR::HomeDef *tao_impl
-- ,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl)
--{}
--
--Dynamic::ParameterList *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
-
--Dynamic::ExceptionList *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
+ if (!(
+ (_tao_in >> id.out ()) &&
+ (_tao_in >> name.out ()) &&
+@@ -45130,7 +44972,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -45164,7 +45005,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::PrimaryKeyDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_PrimaryKeyDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -45218,12 +45059,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
+
+- IR::FactoryDef_var _tao_retval;
+ IR_FactoryDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
+- IR::ParDescriptionSeq params;
+- IR::ExceptionDefSeq exceptions;
+ IR_ParDescriptionSeq params;
+ IR_ExceptionDefSeq exceptions;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> params) &&
-+ (_tao_in >> exceptions)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--CORBA::Any *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
--
-- return safe_result_any._retn ();
--}
-+ _tao_retval = _tao_impl->create_factory (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ params,
-+ exceptions,
-+ ACE_TRY_ENV
-+ );
-
--char *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
-+ ACE_CHECK;
-
--CORBA::Boolean
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--void
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Boolean result)
-+void POA_IR::HomeDef::create_finder_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void *_tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Update the result.
-- this->_result = result;
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
-
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::HomeDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
-- IR::ValueDef_ptr primary_key,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- primary_key_ (primary_key)
--{}
--
--Dynamic::ParameterList *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_primary_key = parameter_list->length ();
-- parameter_list->length (length_primary_key + 1);
-- (*parameter_list)[length_primary_key].argument <<= this->primary_key_;
--
-- (*parameter_list)[length_primary_key].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
+ if (!(
+ (_tao_in >> id.out ()) &&
+ (_tao_in >> name.out ()) &&
+@@ -45233,7 +45074,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -45269,7 +45109,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::FactoryDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_FactoryDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -45323,12 +45163,12 @@
+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+ POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
+
+- IR::FinderDef_var _tao_retval;
+ IR_FinderDef_var _tao_retval;
-+ CORBA::String_var id;
-+ CORBA::String_var name;
-+ CORBA::String_var version;
+ CORBA::String_var id;
+ CORBA::String_var name;
+ CORBA::String_var version;
+- IR::ParDescriptionSeq params;
+- IR::ExceptionDefSeq exceptions;
+ IR_ParDescriptionSeq params;
+ IR_ExceptionDefSeq exceptions;
-+ if (!(
-+ (_tao_in >> id.out ()) &&
-+ (_tao_in >> name.out ()) &&
-+ (_tao_in >> version.out ()) &&
-+ (_tao_in >> params) &&
-+ (_tao_in >> exceptions)
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
-
--Dynamic::ExceptionList *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ _tao_retval = _tao_impl->create_finder (
-+ id.in (),
-+ name.in (),
-+ version.in (),
-+ params,
-+ exceptions,
-+ ACE_TRY_ENV
-+ );
-
--CORBA::Any *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
--}
-+ ACE_CHECK;
-
--char *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-+ if (!(
-+ (_tao_out << _tao_retval.in ())
-+ ))
-+ ACE_THROW (CORBA::MARSHAL () );
- }
-
--CORBA::Boolean
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::HomeDef::_is_a_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
-+ TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-+ POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = 0;
-+ CORBA::String_var value;
+ if (!(
+ (_tao_in >> id.out ()) &&
+ (_tao_in >> name.out ()) &&
+@@ -45338,7 +45178,6 @@
+ ))
+ ACE_THROW (CORBA::MARSHAL());
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+ _tao_server_request.orb_core ()->server_request_interceptors (),
+@@ -45374,7 +45213,7 @@
+ TAO_INTERCEPTOR_CHECK;
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+- IR::FinderDef_ptr _tao_retval_info = _tao_retval._retn ();
++ IR_FinderDef_ptr _tao_retval_info = _tao_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_retval = _tao_retval_info;
+ ri.reply_status (PortableInterceptor::SUCCESSFUL);
+@@ -45429,7 +45268,7 @@
+ POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *) _tao_object_reference;
+ CORBA::Boolean _tao_retval = 0;
+ CORBA::String_var value;
+- if (!(_tao_in >> value.out ()))
+ if (!((_tao_in >> value.out ())))
-+ ACE_THROW (CORBA::MARSHAL ());
-
--void
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (IR::PrimaryKeyDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
--}
-+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-+ ACE_CHECK;
-
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory::TAO_ServerRequestInfo_IR_HomeDef_create_factory (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::HomeDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
-- const IR::ParDescriptionSeq & params,
-- const IR::ExceptionDefSeq & exceptions,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- params_ (params),
-- exceptions_ (exceptions)
--{}
--
--Dynamic::ParameterList *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_params = parameter_list->length ();
-- parameter_list->length (length_params + 1);
-- (*parameter_list)[length_params].argument <<= this->params_;
--
-- (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_exceptions = parameter_list->length ();
-- parameter_list->length (length_exceptions + 1);
-- (*parameter_list)[length_exceptions].argument <<= this->exceptions_;
--
-- (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+ ACE_THROW (CORBA::MARSHAL ());
+
+ _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+@@ -45437,7 +45276,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
- }
-
--Dynamic::ExceptionList *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void POA_IR::HomeDef::_non_existent_skel (
-+ TAO_ServerRequest &_tao_server_request,
-+ void * _tao_object_reference,
-+ void * /* context */,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *) _tao_object_reference;
-+ CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-+ ACE_CHECK;
+ ACE_THROW (CORBA::MARSHAL ());
+ }
--CORBA::Any *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
--
-- return safe_result_any._retn ();
-+ _tao_server_request.init_reply ();
-+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+@@ -45454,7 +45293,7 @@
+
+ _tao_server_request.init_reply ();
+ TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+- if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+ if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-+ ACE_THROW (CORBA::MARSHAL ());
- }
-
--char *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+CORBA::Boolean POA_IR::HomeDef::_is_a (
-+ const char* value,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-+ 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, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-+ return 1;
-+ else
-+ return 0;
- }
-
--CORBA::Boolean
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void* POA_IR::HomeDef::_downcast (
-+ const char* logical_type_id
-+ )
- {
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/HomeDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::HomeDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/InterfaceDef:1.0") == 0)
-+ return ACE_static_cast (POA_IR::InterfaceDef_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Container_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-+ return ACE_static_cast (POA_IR::Contained_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-+ return ACE_static_cast (POA_IR::IDLType_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+ ACE_THROW (CORBA::MARSHAL ());
+ }
+
+@@ -45491,7 +45330,7 @@
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
+ return ACE_static_cast (POA_IR::IDLType_ptr, this);
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+- return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+ return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-+ return ACE_static_cast(PortableServer::Servant, this);
-+ return 0;
+ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+ return ACE_static_cast(PortableServer::Servant, this);
+ return 0;
+@@ -45521,10 +45360,9 @@
+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
+
+ CORBA::Object_var obj = tmp;
+- return ::IR::HomeDef::_unchecked_narrow (obj.in ());
++ return IR_HomeDef::_unchecked_narrow (obj.in ());
}
--void
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (IR::FactoryDef_ptr result)
-+void POA_IR::HomeDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
-- // Update the result.
-- this->_result = result;
--}
-
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder::TAO_ServerRequestInfo_IR_HomeDef_create_finder (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::HomeDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::TAO_ServerRequestInfo_IR_HomeDef_base_home_get (
+ TAO_ServerRequest &_tao_server_request,
+@@ -45982,7 +45820,7 @@
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr primary_key,
++ IR_ValueDef_ptr primary_key,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -46088,8 +45926,8 @@
+ const char * id,
+ const char * name,
+ const char * version,
- const IR::ParDescriptionSeq & params,
- const IR::ExceptionDefSeq & exceptions,
-- CORBA::Environment &
-- )
-- : TAO_ServerRequestInfo (_tao_server_request),
-- _tao_impl (tao_impl),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- params_ (params),
-- exceptions_ (exceptions)
--{}
--
--Dynamic::ParameterList *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_params = parameter_list->length ();
-- parameter_list->length (length_params + 1);
-- (*parameter_list)[length_params].argument <<= this->params_;
--
-- (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_exceptions = parameter_list->length ();
-- parameter_list->length (length_exceptions + 1);
-- (*parameter_list)[length_exceptions].argument <<= this->exceptions_;
--
-- (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
-
--Dynamic::ExceptionList *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+const char* POA_IR::HomeDef::_interface_repository_id (void) const
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ return "IDL:omg.org/IR/HomeDef:1.0";
- }
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -46202,8 +46040,8 @@
+ 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 &
+ )
+ : TAO_ServerRequestInfo (_tao_server_request),
+@@ -46312,4 +46150,5 @@
--CORBA::Any *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR::HomeDef*
-+POA_IR::HomeDef::_this (CORBA_Environment &ACE_TRY_ENV)
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-+ TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
-- CORBA::Any_var safe_result_any = result_any;
-+ CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
-- (*result_any) <<= this->_result;
-+ if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
-+ else
-+ ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-
-- return safe_result_any._retn ();
--}
--
--char *
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder::target_most_derived_interface (
-- CORBA::Environment &)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return
-- CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
--}
--
--CORBA::Boolean
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder::target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
--}
--
--void
--POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (IR::FinderDef_ptr result)
--{
-- // Update the result.
-- this->_result = result;
-+ CORBA::Object_var obj = tmp;
-+ return IR_HomeDef::_unchecked_narrow (obj.in ());
- }
+ #endif /* TAO_HAS_INTERCEPTORS */
--#endif /* TAO_HAS_INTERCEPTORS */
+-#endif /* ifndef */
++#endif /* ifndef TAO_IDL_INTERFACES_CPP */
++
diff --git a/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.h.diff
index ef4b62c2985..745f47aeb1c 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.h.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.h.diff
@@ -1,5 +1,5 @@
---- InterfaceS.h Fri Jan 12 22:31:13 2001
-+++ ..\InterfaceS.h Fri Jan 12 22:34:21 2001
+--- orig/InterfaceS.h Fri Mar 09 00:47:29 2001
++++ ../../orbsvcs/IFR_Service/InterfaceS.h Thu Mar 01 15:34:32 2001
@@ -1,6 +1,6 @@
// -*- C++ -*-
//
@@ -8,19 +8,19 @@
// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
// TAO and the TAO IDL Compiler have been developed by:
-@@ -19,23 +19,22 @@
+@@ -19,23 +19,24 @@
// Information about TAO is available at:
// http://www.cs.wustl.edu/~schmidt/TAO.html
--#ifndef _TAO_IDL_INTERFACES_H_
--#define _TAO_IDL_INTERFACES_H_
+-#ifndef _TAO_IDL_ORIG_INTERFACES_H_
+-#define _TAO_IDL_ORIG_INTERFACES_H_
-
+#ifndef TAO_IDL_INTERFACES_H
+#define TAO_IDL_INTERFACES_H
#include "ace/pre.h"
-#include "InterfaceC.h"
-+#include "tao/IFR_Basic/InterfaceC.h"
++#include "tao/IFR_Client/InterfaceC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
@@ -33,14 +33,15 @@
+#include "tao/PortableServer/Object_Adapter.h"
#include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h"
-#include "tao/PortableServer/Direct_Object_Proxy_Impl.h"
--#include "tao/PortableServer/ServerRequestInfo.h"
+ #include "tao/PortableServer/ServerRequestInfo.h"
++#include "tao/PortableInterceptor.h"
+#include "tao/Stub.h"
+#include "tao/ORB_Core.h"
+#include "tao/TAO_Server_Request.h"
#if defined(_MSC_VER)
#if (_MSC_VER >= 1200)
-@@ -48,224 +47,108 @@
+@@ -48,28 +49,20 @@
#pragma option push -w-rvl -w-rch -w-ccc -w-inl
#endif /* __BORLANDC__ */
@@ -48,270 +49,97 @@
-{
-}
-TAO_NAMESPACE_CLOSE
-+class POA_CORBA_IRObject;
-+typedef POA_CORBA_IRObject *POA_CORBA_IRObject_ptr;
-+// Forward Classes Declaration
-+class _TAO_IRObject_ThruPOA_Proxy_Impl;
-+class _TAO_IRObject_Strategized_Proxy_Broker;
-
+-
-TAO_NAMESPACE POA_CORBA
-+class POA_CORBA_IRObject : public virtual PortableServer::ServantBase
- {
+-{
- 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:
++class POA_CORBA_IRObject;
++typedef POA_CORBA_IRObject *POA_CORBA_IRObject_ptr;
+ // Forward Classes Declaration
+ class _TAO_IRObject_ThruPOA_Proxy_Impl;
+ class _TAO_IRObject_Strategized_Proxy_Broker;
+
+- class TAO_IFR_Client_Export IRObject : public virtual PortableServer::ServantBase
++class POA_CORBA_IRObject : public virtual PortableServer::ServantBase
+ {
+ protected:
- IRObject (void);
--
-- public:
++ POA_CORBA_IRObject (void);
+
+ public:
- IRObject (const IRObject& rhs);
- virtual ~IRObject (void);
-
--
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual void* _downcast (
-- 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 ()
-- );
--
-- static void _non_existent_skel (
-- 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 ()
-- );
--
-- ::CORBA::IRObject *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+protected:
-+ POA_CORBA_IRObject (void);
-
-- virtual const char* _interface_repository_id (void) const;
-+public:
+ POA_CORBA_IRObject (const POA_CORBA_IRObject& rhs);
+ virtual ~POA_CORBA_IRObject (void);
+ virtual CORBA::Boolean _is_a (
+ const char* logical_type_id,
+@@ -111,7 +104,7 @@
+
+ virtual const char* _interface_repository_id (void) const;
+
- virtual IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
-
-- virtual void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void destroy_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_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 ()
-+ );
++ virtual IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -143,7 +136,6 @@
+ TAO_default_environment ()
+ );
-
--#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_ServerRequestInfo_CORBA_IRObject_def_kind_get : public TAO_ServerRequestInfo
-- {
-- public:
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -152,10 +144,10 @@
+ class TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get : public TAO_ServerRequestInfo
+ {
+ public:
- friend class POA_CORBA::IRObject;
-- TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (
-- TAO_ServerRequest &_tao_server_request,
++ friend class POA_CORBA_IRObject;
+ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (
+ TAO_ServerRequest &_tao_server_request,
- POA_CORBA::IRObject *tao_impl
-- ,
-- 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 ()
-+ );
-
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (const TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get &);
-- void operator= (const TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get &);
--
-- private:
++ POA_CORBA_IRObject *tao_impl
+ ,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -194,19 +186,19 @@
+ void operator= (const TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get &);
+
+ private:
- POA_CORBA::IRObject *_tao_impl;
-- void result (IR::DefinitionKind result);
-- // update the result
++ POA_CORBA_IRObject *_tao_impl;
+ void result (IR::DefinitionKind result);
+ // update the result
-IR::DefinitionKind _result;
--};
-+ ::CORBA::IRObject *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ IR_DefinitionKind _result;
+ };
--class TAO_ServerRequestInfo_CORBA_IRObject_destroy : public TAO_ServerRequestInfo
--{
--public:
+ class TAO_ServerRequestInfo_CORBA_IRObject_destroy : public TAO_ServerRequestInfo
+ {
+ public:
- friend class POA_CORBA::IRObject;
-- TAO_ServerRequestInfo_CORBA_IRObject_destroy (
-- TAO_ServerRequest &_tao_server_request,
++ friend class POA_CORBA_IRObject;
+ TAO_ServerRequestInfo_CORBA_IRObject_destroy (
+ TAO_ServerRequest &_tao_server_request,
- POA_CORBA::IRObject *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual const char* _interface_repository_id (void) const;
-
-- virtual Dynamic::ParameterList * arguments (
-+ virtual IR_DefinitionKind def_kind (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
-+ ACE_THROW_SPEC ((
-+ 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 ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-+ );
-+
-+ virtual void destroy (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_CORBA_IRObject_destroy (const TAO_ServerRequestInfo_CORBA_IRObject_destroy &);
-- void operator= (const TAO_ServerRequestInfo_CORBA_IRObject_destroy &);
--
--private:
++ POA_CORBA_IRObject *tao_impl
+ ,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -245,27 +237,27 @@
+ void operator= (const TAO_ServerRequestInfo_CORBA_IRObject_destroy &);
+
+ private:
- POA_CORBA::IRObject *_tao_impl;
-- };
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ ACE_THROW_SPEC ((
-+ 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 ()
-+ );
++ POA_CORBA_IRObject *_tao_impl;
+ };
+
+ #endif /* TAO_HAS_INTERCEPTORS */
+
};
-
@@ -319,66 +147,53 @@
// Strategized Proxy Broker Declaration
//
--class _TAO_IRObject_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_IRObject_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_IRObject_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_IRObject_Proxy_Broker
+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 ::CORBA::_TAO_IRObject_Proxy_Impl &select_proxy (
- ::CORBA::IRObject *object,
-+
+ virtual _TAO_IRObject_Proxy_Impl &select_proxy (
+ CORBA_IRObject *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -279,13 +162,12 @@
- );
-
- private:
--
-+
+@@ -283,8 +275,7 @@
// 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.
- ::CORBA::_TAO_IRObject_Proxy_Impl
- *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
--
+ _TAO_IRObject_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-+
+
TAO_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
-@@ -305,16 +187,16 @@
+@@ -305,8 +296,8 @@
// ThruPOA Impl. Declaration
//
--class _TAO_IRObject_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_IRObject_ThruPOA_Proxy_Impl :
- public virtual ::CORBA::_TAO_IRObject_Proxy_Impl,
-- public virtual TAO_ThruPOA_Object_Proxy_Impl
+class _TAO_IRObject_ThruPOA_Proxy_Impl
+ : public virtual _TAO_IRObject_Proxy_Impl,
-+ public virtual TAO_ThruPOA_Object_Proxy_Impl
+ public virtual TAO_ThruPOA_Object_Proxy_Impl
{
public:
- _TAO_IRObject_ThruPOA_Proxy_Impl (void);
--
-- virtual ~_TAO_IRObject_ThruPOA_Proxy_Impl (void) { }
--
+@@ -314,7 +305,7 @@
+
+ virtual ~_TAO_IRObject_ThruPOA_Proxy_Impl (void) { }
+
- virtual IR::DefinitionKind def_kind (
-+
-+ virtual ~_TAO_IRObject_ThruPOA_Proxy_Impl (void);
-+
+ virtual IR_DefinitionKind def_kind (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -332,77 +214,10 @@
+@@ -332,77 +323,10 @@
};
@@ -391,7 +206,7 @@
-#if defined (ACE_HAS_USING_KEYWORD)
-// TIE class: Refer to CORBA v2.2, Section 20.34.4
-template <class T>
--class IRObject_tie : public IRObject
+-class TAO_IFR_Client_Export IRObject_tie : public IRObject
-{
-public:
- IRObject_tie (T &t);
@@ -456,313 +271,69 @@
TAO_NAMESPACE POA_IR
{
class Contained;
-@@ -411,7 +226,7 @@
+@@ -411,7 +335,7 @@
class _TAO_Contained_ThruPOA_Proxy_Impl;
class _TAO_Contained_Strategized_Proxy_Broker;
-- class Contained : public virtual POA_CORBA::IRObject
+- class TAO_IFR_Client_Export Contained : public virtual POA_CORBA::IRObject
+ class Contained : public virtual POA_CORBA_IRObject
{
protected:
Contained (void);
-@@ -420,10 +235,9 @@
+@@ -420,7 +344,6 @@
Contained (const Contained& rhs);
virtual ~Contained (void);
-
virtual CORBA::Boolean _is_a (
const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- );
-
-@@ -435,7 +249,7 @@
- TAO_ServerRequest &req,
- void *obj,
- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- );
-
-@@ -443,26 +257,26 @@
- TAO_ServerRequest &req,
- void *obj,
- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- );
-
- virtual void _dispatch (
- TAO_ServerRequest &_tao_req,
- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -454,7 +377,7 @@
TAO_default_environment ()
);
- ::IR::Contained *_this (
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_Contained *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- );
-
-- virtual const char* _interface_repository_id (void) const;
-+ virtual const char *_interface_repository_id (void) const;
-
-- virtual char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-+ virtual char *id (
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -470,16 +284,16 @@
- )) = 0;
-
- static void _get_id_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
-
- virtual void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-+ const char *id,
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -487,15 +301,15 @@
- )) = 0;
-
- static void _set_id_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- );
-
-- virtual char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-+ virtual char *name (
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -503,16 +317,16 @@
- )) = 0;
-
- static void _get_name_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- );
-
- virtual void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-+ const char *name,
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -520,15 +334,15 @@
- )) = 0;
-
- static void _set_name_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- );
-
-- virtual char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-+ virtual char *version (
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -536,16 +350,16 @@
- )) = 0;
-
- static void _get_version_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- );
-
- virtual void version (
- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -553,15 +367,15 @@
- )) = 0;
-
- static void _set_version_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
+@@ -560,7 +483,7 @@
TAO_default_environment ()
);
- virtual IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -569,15 +383,15 @@
- )) = 0;
-
- static void _get_defined_in_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- );
-
-- virtual char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-+ virtual char *absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -585,15 +399,15 @@
- )) = 0;
-
- static void _get_absolute_name_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
+@@ -592,7 +515,7 @@
TAO_default_environment ()
);
- virtual IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -601,15 +415,15 @@
- )) = 0;
-
- static void _get_containing_repository_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
+@@ -608,7 +531,7 @@
TAO_default_environment ()
);
- virtual IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_Contained::Description *describe (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -617,18 +431,18 @@
- )) = 0;
-
- static void describe_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+@@ -625,7 +548,7 @@
);
virtual void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_Container_ptr new_container,
-+ const char *new_name,
-+ const char *new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -636,10 +450,10 @@
- )) = 0;
-
- static void move_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- );
-
-@@ -647,604 +461,33 @@
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -647,7 +570,7 @@
TAO_ServerRequest &req,
void *obj,
void *context,
@@ -771,619 +342,89 @@
TAO_default_environment ()
);
- static void destroy_skel (
-- TAO_ServerRequest &req,
-+ TAO_ServerRequest &req,
+@@ -655,11 +578,10 @@
+ TAO_ServerRequest &req,
void *obj,
void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
--
--#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_ServerRequestInfo_IR_Contained_id_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::Contained;
-- TAO_ServerRequestInfo_IR_Contained_id_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_Contained_id_get (const TAO_ServerRequestInfo_IR_Contained_id_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_Contained_id_get &);
--
-- private:
-- POA_IR::Contained *_tao_impl;
-- void result (char * result);
-- // update the result
--char * _result;
- };
--class TAO_ServerRequestInfo_IR_Contained_id_set : public TAO_ServerRequestInfo
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Declaration
-+//
-+
-+class _TAO_Contained_Strategized_Proxy_Broker : public virtual _TAO_Contained_Proxy_Broker
- {
--public:
-- friend class POA_IR::Contained;
-- TAO_ServerRequestInfo_IR_Contained_id_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
-- 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));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Contained_id_set (const TAO_ServerRequestInfo_IR_Contained_id_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_Contained_id_set &);
--
--private:
-- POA_IR::Contained *_tao_impl;
-- const char * id_;
--};
--
--class TAO_ServerRequestInfo_IR_Contained_name_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Contained;
-- TAO_ServerRequestInfo_IR_Contained_name_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Contained_name_get (const TAO_ServerRequestInfo_IR_Contained_name_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_Contained_name_get &);
--
--private:
-- POA_IR::Contained *_tao_impl;
-- void result (char * result);
-- // update the result
--char * _result;
--};
--
--class TAO_ServerRequestInfo_IR_Contained_name_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Contained;
-- TAO_ServerRequestInfo_IR_Contained_name_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
-- 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));
--
-- virtual CORBA::Any * result (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Contained_name_set (const TAO_ServerRequestInfo_IR_Contained_name_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_Contained_name_set &);
--
--private:
-- POA_IR::Contained *_tao_impl;
-- const char * name_;
--};
--
--class TAO_ServerRequestInfo_IR_Contained_version_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Contained;
-- TAO_ServerRequestInfo_IR_Contained_version_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Contained_version_get (const TAO_ServerRequestInfo_IR_Contained_version_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_Contained_version_get &);
--
--private:
-- POA_IR::Contained *_tao_impl;
-- void result (char * result);
-- // update the result
--char * _result;
--};
--
--class TAO_ServerRequestInfo_IR_Contained_version_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Contained;
-- TAO_ServerRequestInfo_IR_Contained_version_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
-- 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));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Contained_version_set (const TAO_ServerRequestInfo_IR_Contained_version_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_Contained_version_set &);
--
--private:
-- POA_IR::Contained *_tao_impl;
-- const char * version_;
--};
--
--class TAO_ServerRequestInfo_IR_Contained_defined_in_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Contained;
-- TAO_ServerRequestInfo_IR_Contained_defined_in_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Contained_defined_in_get (const TAO_ServerRequestInfo_IR_Contained_defined_in_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_Contained_defined_in_get &);
--
--private:
-- POA_IR::Contained *_tao_impl;
-- void result (IR::Container_ptr result);
-- // update the result
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -1016,7 +938,7 @@
+ POA_IR::Contained *_tao_impl;
+ void result (IR::Container_ptr result);
+ // update the result
-IR::Container_ptr _result;
--};
--
--class TAO_ServerRequestInfo_IR_Contained_absolute_name_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Contained;
-- TAO_ServerRequestInfo_IR_Contained_absolute_name_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Contained_absolute_name_get (const TAO_ServerRequestInfo_IR_Contained_absolute_name_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_Contained_absolute_name_get &);
--
--private:
-- POA_IR::Contained *_tao_impl;
-- void result (char * result);
-- // update the result
--char * _result;
--};
--
--class TAO_ServerRequestInfo_IR_Contained_containing_repository_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Contained;
-- TAO_ServerRequestInfo_IR_Contained_containing_repository_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Contained_containing_repository_get (const TAO_ServerRequestInfo_IR_Contained_containing_repository_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_Contained_containing_repository_get &);
--
--private:
-- POA_IR::Contained *_tao_impl;
-- void result (IR::Repository_ptr result);
-- // update the result
++ IR_Container_ptr _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_Contained_absolute_name_get : public TAO_ServerRequestInfo
+@@ -1118,7 +1040,7 @@
+ POA_IR::Contained *_tao_impl;
+ void result (IR::Repository_ptr result);
+ // update the result
-IR::Repository_ptr _result;
--};
--
--class TAO_ServerRequestInfo_IR_Contained_describe : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Contained;
-- TAO_ServerRequestInfo_IR_Contained_describe (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Contained_describe (const TAO_ServerRequestInfo_IR_Contained_describe &);
-- void operator= (const TAO_ServerRequestInfo_IR_Contained_describe &);
--
--private:
-- POA_IR::Contained *_tao_impl;
-- void result (IR::Contained::Description * result);
-- // update the result
++ IR_Repository_ptr _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_Contained_describe : public TAO_ServerRequestInfo
+@@ -1169,7 +1091,7 @@
+ POA_IR::Contained *_tao_impl;
+ void result (IR::Contained::Description * result);
+ // update the result
-IR::Contained::Description * _result;
--};
--
--class TAO_ServerRequestInfo_IR_Contained_move : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Contained;
-- TAO_ServerRequestInfo_IR_Contained_move (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Contained *tao_impl
-- ,
++ IR_Contained::Description * _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_Contained_move : public TAO_ServerRequestInfo
+@@ -1180,7 +1102,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::Contained *tao_impl
+ ,
- 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));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Contained_move (const TAO_ServerRequestInfo_IR_Contained_move &);
-- void operator= (const TAO_ServerRequestInfo_IR_Contained_move &);
--
--private:
-- POA_IR::Contained *_tao_impl;
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -1221,7 +1143,7 @@
+
+ private:
+ POA_IR::Contained *_tao_impl;
- IR::Container_ptr new_container_;
--const char * new_name_;
--const char * new_version_;
--};
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--};
--
--
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Declaration
--//
++ IR_Container_ptr new_container_;
+ const char * new_name_;
+ const char * new_version_;
+ };
+@@ -1230,20 +1152,19 @@
+
+ };
+
-
--class _TAO_Contained_Strategized_Proxy_Broker : public virtual ::IR::_TAO_Contained_Proxy_Broker
--{
--public:
-- _TAO_Contained_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_Contained_Strategized_Proxy_Broker (void);
--
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Declaration
+ //
+
+-class TAO_IFR_Client_Export _TAO_Contained_Strategized_Proxy_Broker : public virtual ::IR::_TAO_Contained_Proxy_Broker
++class _TAO_Contained_Strategized_Proxy_Broker : public virtual _TAO_Contained_Proxy_Broker
+ {
+ public:
+ _TAO_Contained_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_Contained_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_Contained_Proxy_Impl &select_proxy (
- ::IR::Contained *object,
-- CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-+public:
-+ _TAO_Contained_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_Contained_Strategized_Proxy_Broker (void);
-+
+ virtual _TAO_Contained_Proxy_Impl &select_proxy (
+ IR_Contained *object,
-+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
- private:
-@@ -1261,7 +504,7 @@
+@@ -1261,7 +1182,7 @@
// 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.
@@ -1392,7 +433,7 @@
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -1273,7 +516,6 @@
+@@ -1273,7 +1194,6 @@
static _TAO_Contained_Strategized_Proxy_Broker *the_TAO_Contained_Strategized_Proxy_Broker (void);
};
@@ -1400,11 +441,11 @@
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-@@ -1283,18 +525,18 @@
+@@ -1283,10 +1203,10 @@
// ThruPOA Impl. Declaration
//
--class _TAO_Contained_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_Contained_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_Contained_Proxy_Impl,
+class _TAO_Contained_ThruPOA_Proxy_Impl :
+ public virtual _TAO_Contained_Proxy_Impl,
@@ -1414,62 +455,7 @@
{
public:
- _TAO_Contained_ThruPOA_Proxy_Impl (void);
-
-- virtual ~_TAO_Contained_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_Contained_ThruPOA_Proxy_Impl (void);
-
-- virtual char * id (
-+ virtual char * id (
- CORBA_Object *_collocated_tao_target_,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -1302,7 +544,7 @@
- CORBA::SystemException
- ));
-
-- virtual void id (
-+ virtual void id (
- CORBA_Object *_collocated_tao_target_,
- const char * id,
- CORBA::Environment &ACE_TRY_ENV
-@@ -1311,7 +553,7 @@
- CORBA::SystemException
- ));
-
-- virtual char * name (
-+ virtual char * name (
- CORBA_Object *_collocated_tao_target_,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -1319,7 +561,7 @@
- CORBA::SystemException
- ));
-
-- virtual void name (
-+ virtual void name (
- CORBA_Object *_collocated_tao_target_,
- const char * name,
- CORBA::Environment &ACE_TRY_ENV
-@@ -1328,7 +570,7 @@
- CORBA::SystemException
- ));
-
-- virtual char * version (
-+ virtual char * version (
- CORBA_Object *_collocated_tao_target_,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -1336,7 +578,7 @@
- CORBA::SystemException
- ));
-
-- virtual void version (
-+ virtual void version (
- CORBA_Object *_collocated_tao_target_,
- const char * version,
- CORBA::Environment &ACE_TRY_ENV
-@@ -1345,7 +587,7 @@
+@@ -1345,7 +1265,7 @@
CORBA::SystemException
));
@@ -1478,16 +464,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -1353,7 +595,7 @@
- CORBA::SystemException
- ));
-
-- virtual char * absolute_name (
-+ virtual char * absolute_name (
- CORBA_Object *_collocated_tao_target_,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -1361,7 +603,7 @@
+@@ -1361,7 +1281,7 @@
CORBA::SystemException
));
@@ -1496,7 +473,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -1369,7 +611,7 @@
+@@ -1369,7 +1289,7 @@
CORBA::SystemException
));
@@ -1505,25823 +482,8901 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -1377,9 +619,9 @@
- CORBA::SystemException
- ));
+@@ -1379,7 +1299,7 @@
-- virtual void move (
-+ virtual void move (
+ 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
-@@ -1395,1450 +637,1136 @@
+@@ -1395,11 +1315,10 @@
// ThruPOA Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-
#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class Contained_tie : public Contained
--{
--public:
-- Contained_tie (T &t);
-- // the T& ctor
-- Contained_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- Contained_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- Contained_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~Contained_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export Contained_tie : public Contained
+ class Contained_tie : public Contained
-+ {
-+ public:
-+ Contained_tie (T &t);
-+ // the T& ctor
-+ Contained_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ Contained_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ Contained_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~Contained_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void version (
-- const char * version,
+ {
+ public:
+ Contained_tie (T &t);
+@@ -1427,7 +1346,7 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+ char * id (
+@@ -1481,7 +1400,7 @@
+ CORBA::SystemException
+ ));
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -1497,7 +1416,7 @@
+ CORBA::SystemException
+ ));
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -1505,7 +1424,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void move (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -1514,7 +1433,7 @@
+ ));
+
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void move (
+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -1524,7 +1443,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -1558,7 +1477,7 @@
+ class _TAO_Container_ThruPOA_Proxy_Impl;
+ class _TAO_Container_Strategized_Proxy_Broker;
- private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- Contained_tie (const Contained_tie &);
-- void operator= (const Contained_tie &);
--};
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-+
-+ // copy and assignment are not allowed
-+ Contained_tie (const Contained_tie &);
-+ void operator= (const Contained_tie &);
-+ };
-
- #endif /* ACE_HAS_USING_KEYWORD */
-
--class Container;
--typedef Container *Container_ptr;
--// Forward Classes Declaration
--class _TAO_Container_ThruPOA_Proxy_Impl;
--class _TAO_Container_Strategized_Proxy_Broker;
-+ class Container;
-+ typedef Container *Container_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_Container_ThruPOA_Proxy_Impl;
-+ class _TAO_Container_Strategized_Proxy_Broker;
-
--class Container : public virtual POA_CORBA::IRObject
--{
--protected:
-- Container (void);
+-class TAO_IFR_Client_Export Container : public virtual POA_CORBA::IRObject
+ class Container : public virtual POA_CORBA_IRObject
-+ {
-+ protected:
-+ Container (void);
-
--public:
-- Container (const Container& rhs);
-- virtual ~Container (void);
-+ public:
-+ Container (const Container& rhs);
-+ virtual ~Container (void);
-
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char *logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+ virtual void *_downcast (
-+ 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 ()
-- );
-+ static void _is_a_skel (
-+ 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 ()
-- );
-+ static void _non_existent_skel (
-+ 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 ()
-- );
-+ virtual void _dispatch (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+ {
+ protected:
+ Container (void);
+@@ -1601,14 +1520,14 @@
+ TAO_default_environment ()
+ );
- ::IR::Container *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
+ IR_Container *_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 const char *_interface_repository_id (void) const;
+ virtual const char* _interface_repository_id (void) const;
- virtual IR::Contained_ptr lookup (
-- const char * search_name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
+ virtual IR_Contained_ptr lookup (
-+ const char *search_name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void lookup_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void lookup_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+ const char * search_name,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -1625,8 +1544,8 @@
+ TAO_default_environment ()
+ );
- virtual IR::ContainedSeq * contents (
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
+ virtual IR_ContainedSeq *contents (
+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void contents_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void contents_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -1643,10 +1562,10 @@
+ TAO_default_environment ()
+ );
- virtual IR::ContainedSeq * lookup_name (
-- const char * search_name,
-- CORBA::Long levels_to_search,
-- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
-- static void lookup_name_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
+ virtual IR_ContainedSeq *lookup_name (
-+ const char *search_name,
-+ CORBA::Long levels_to_search,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -1663,8 +1582,8 @@
+ TAO_default_environment ()
+ );
- 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
-- )) = 0;
-+ static void lookup_name_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void describe_contents_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
+ 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
-+ )) = 0;
+ CORBA::Boolean exclude_inherited,
+ CORBA::Long max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -1682,7 +1601,7 @@
+ TAO_default_environment ()
+ );
- 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
-- )) = 0;
-+ static void describe_contents_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_module_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
+ 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
-+ )) = 0;
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -1701,11 +1620,11 @@
+ TAO_default_environment ()
+ );
- 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
-- )) = 0;
-+ static void create_module_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_constant_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
+ virtual IR_ConstantDef_ptr create_constant (
-+ const char *id,
-+ const char *name,
-+ const char *version,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -1722,11 +1641,11 @@
+ TAO_default_environment ()
+ );
- 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
-- )) = 0;
-+ static void create_constant_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_struct_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
+ virtual IR_StructDef_ptr create_struct (
-+ const char *id,
-+ const char *name,
-+ const char *version,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -1742,12 +1661,12 @@
+ TAO_default_environment ()
+ );
- virtual IR::UnionDef_ptr create_union (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- )) = 0;
-+ static void create_struct_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_union_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ )) = 0;
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -1763,11 +1682,11 @@
+ TAO_default_environment ()
+ );
- 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
-- )) = 0;
-+ static void create_union_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_enum_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
+ virtual IR_EnumDef_ptr create_enum (
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -1783,11 +1702,11 @@
+ TAO_default_environment ()
+ );
- 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
-- )) = 0;
-+ static void create_enum_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_alias_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
+ virtual IR_AliasDef_ptr create_alias (
-+ const char *id,
-+ const char *name,
-+ const char *version,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -1803,11 +1722,11 @@
+ TAO_default_environment ()
+ );
- 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
-- )) = 0;
-+ static void create_alias_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_interface_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
+ virtual IR_InterfaceDef_ptr create_interface (
-+ const char *id,
-+ const char *name,
-+ const char *version,
+ 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 =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -1825,17 +1744,17 @@
+ TAO_default_environment ()
+ );
- virtual IR::ValueDef_ptr create_value (
-- const char * id,
-- const char * name,
-- const char * version,
-- CORBA::Boolean is_custom,
-- CORBA::Boolean is_abstract,
++ 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,
++ 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
-- )) = 0;
-+ static void create_interface_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_value_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ )) = 0;
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -1851,11 +1770,11 @@
+ TAO_default_environment ()
+ );
- 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
-- )) = 0;
-+ static void create_value_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_value_box_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
+ virtual IR_ValueBoxDef_ptr create_value_box (
-+ const char *id,
-+ const char *name,
-+ const char *version,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -1871,11 +1790,11 @@
+ TAO_default_environment ()
+ );
- 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
-- )) = 0;
-+ static void create_value_box_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_exception_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
+ virtual IR_ExceptionDef_ptr create_exception (
-+ const char *id,
-+ const char *name,
-+ const char *version,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -1891,7 +1810,7 @@
+ TAO_default_environment ()
+ );
- 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
-- )) = 0;
--
-- static void create_native_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ virtual IR_NativeDef_ptr create_native (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -1914,7 +1833,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -1922,11 +1841,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
-
--#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_ServerRequestInfo_IR_Container_lookup : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::Container;
-- TAO_ServerRequestInfo_IR_Container_lookup (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * search_name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual Dynamic::ParameterList * arguments (
-+ static void create_exception_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
-+ );
-+
-+ 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::Any * result (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-+
-+ static void create_native_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_Container_lookup (const TAO_ServerRequestInfo_IR_Container_lookup &);
-- void operator= (const TAO_ServerRequestInfo_IR_Container_lookup &);
--
-- private:
-- POA_IR::Container *_tao_impl;
-- const char * search_name_;
--void result (IR::Contained_ptr result);
-- // update the result
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -1982,7 +1900,7 @@
+ const char * search_name_;
+ void result (IR::Contained_ptr result);
+ // update the result
-IR::Contained_ptr _result;
--};
-+ );
++ IR_Contained_ptr _result;
+ };
--class TAO_ServerRequestInfo_IR_Container_contents : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Container;
-- TAO_ServerRequestInfo_IR_Container_contents (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
+ class TAO_ServerRequestInfo_IR_Container_contents : public TAO_ServerRequestInfo
+@@ -1993,7 +1911,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::Container *tao_impl
+ ,
- IR::DefinitionKind & limit_type,
-- const CORBA::Boolean & exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Container_contents (const TAO_ServerRequestInfo_IR_Container_contents &);
-- void operator= (const TAO_ServerRequestInfo_IR_Container_contents &);
--
--private:
-- POA_IR::Container *_tao_impl;
++ IR_DefinitionKind & limit_type,
+ const CORBA::Boolean & exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -2033,11 +1951,11 @@
+
+ private:
+ POA_IR::Container *_tao_impl;
- const IR::DefinitionKind & limit_type_;
--const CORBA::Boolean & exclude_inherited_;
--void result (IR::ContainedSeq * result);
-- // update the result
++ const IR_DefinitionKind & limit_type_;
+ const CORBA::Boolean & exclude_inherited_;
+ void result (IR::ContainedSeq * result);
+ // update the result
-IR::ContainedSeq * _result;
--};
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
-+
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Declaration
-+//
-
--class TAO_ServerRequestInfo_IR_Container_lookup_name : public TAO_ServerRequestInfo
-+class _TAO_Container_Strategized_Proxy_Broker : public virtual _TAO_Container_Proxy_Broker
- {
--public:
-- friend class POA_IR::Container;
-- TAO_ServerRequestInfo_IR_Container_lookup_name (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- 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 ()
-- );
-+public:
-+ _TAO_Container_Strategized_Proxy_Broker (void);
++ IR_ContainedSeq * _result;
+ };
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Container_lookup_name (const TAO_ServerRequestInfo_IR_Container_lookup_name &);
-- void operator= (const TAO_ServerRequestInfo_IR_Container_lookup_name &);
--
--private:
-- POA_IR::Container *_tao_impl;
-- const char * search_name_;
--const CORBA::Long & levels_to_search_;
+ class TAO_ServerRequestInfo_IR_Container_lookup_name : public TAO_ServerRequestInfo
+@@ -2050,7 +1968,7 @@
+ ,
+ const char * search_name,
+ const CORBA::Long & levels_to_search,
+- IR::DefinitionKind & limit_type,
++ IR_DefinitionKind & limit_type,
+ const CORBA::Boolean & exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -2092,11 +2010,11 @@
+ POA_IR::Container *_tao_impl;
+ 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
++ const IR_DefinitionKind & limit_type_;
+ const CORBA::Boolean & exclude_inherited_;
+ void result (IR::ContainedSeq * result);
+ // update the result
-IR::ContainedSeq * _result;
--};
-+ virtual ~_TAO_Container_Strategized_Proxy_Broker (void);
++ IR_ContainedSeq * _result;
+ };
--class TAO_ServerRequestInfo_IR_Container_describe_contents : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Container;
-- TAO_ServerRequestInfo_IR_Container_describe_contents (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
+ class TAO_ServerRequestInfo_IR_Container_describe_contents : public TAO_ServerRequestInfo
+@@ -2107,7 +2025,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::Container *tao_impl
+ ,
- IR::DefinitionKind & limit_type,
-- const CORBA::Boolean & exclude_inherited,
-- const CORBA::Long & max_returned_objs,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual _TAO_Container_Proxy_Impl &select_proxy (
-+ IR_Container *object,
-+ 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Container_describe_contents (const TAO_ServerRequestInfo_IR_Container_describe_contents &);
-- void operator= (const TAO_ServerRequestInfo_IR_Container_describe_contents &);
--
++ IR_DefinitionKind & limit_type,
+ const CORBA::Boolean & exclude_inherited,
+ const CORBA::Long & max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -2148,12 +2066,12 @@
+
private:
-- POA_IR::Container *_tao_impl;
+ POA_IR::Container *_tao_impl;
- const IR::DefinitionKind & limit_type_;
--const CORBA::Boolean & exclude_inherited_;
--const CORBA::Long & max_returned_objs_;
--void result (IR::Container::DescriptionSeq * result);
-- // update the result
++ const IR_DefinitionKind & limit_type_;
+ const CORBA::Boolean & exclude_inherited_;
+ const CORBA::Long & max_returned_objs_;
+ void result (IR::Container::DescriptionSeq * result);
+ // update the result
-IR::Container::DescriptionSeq * _result;
--};
-
--class TAO_ServerRequestInfo_IR_Container_create_module : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Container;
-- TAO_ServerRequestInfo_IR_Container_create_module (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+// 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
- );
++ IR_Container::DescriptionSeq * _result;
+ };
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
- private:
-- TAO_ServerRequestInfo_IR_Container_create_module (const TAO_ServerRequestInfo_IR_Container_create_module &);
-- void operator= (const TAO_ServerRequestInfo_IR_Container_create_module &);
-
--private:
-- POA_IR::Container *_tao_impl;
-- const char * id_;
--const char * name_;
--const char * version_;
--void result (IR::ModuleDef_ptr result);
-- // update the result
+ class TAO_ServerRequestInfo_IR_Container_create_module : public TAO_ServerRequestInfo
+@@ -2210,7 +2128,7 @@
+ const char * version_;
+ void result (IR::ModuleDef_ptr result);
+ // update the result
-IR::ModuleDef_ptr _result;
--};
-+ // 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_Container_Proxy_Impl
-+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-+
-+ TAO_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.
-
--class TAO_ServerRequestInfo_IR_Container_create_constant : public TAO_ServerRequestInfo
--{
- public:
-- friend class POA_IR::Container;
-- TAO_ServerRequestInfo_IR_Container_create_constant (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
++ IR_ModuleDef_ptr _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_Container_create_constant : public TAO_ServerRequestInfo
+@@ -2224,7 +2142,7 @@
+ 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));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Container_create_constant (const TAO_ServerRequestInfo_IR_Container_create_constant &);
-- void operator= (const TAO_ServerRequestInfo_IR_Container_create_constant &);
--
--private:
-- POA_IR::Container *_tao_impl;
-- 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 ()
+@@ -2267,11 +2185,11 @@
+ 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_IDLType_ptr type_;
+ const CORBA::Any & value_;
+ void result (IR::ConstantDef_ptr result);
+ // update the result
-IR::ConstantDef_ptr _result;
-+ static _TAO_Container_Strategized_Proxy_Broker *the_TAO_Container_Strategized_Proxy_Broker (void);
++ IR_ConstantDef_ptr _result;
};
--class TAO_ServerRequestInfo_IR_Container_create_struct : public TAO_ServerRequestInfo
-+//
-+// End Strategized Proxy Broker Declaration
-+///////////////////////////////////////////////////////////////////////
-+
-+
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Impl. Declaration
-+//
-+
-+class _TAO_Container_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_Container_Proxy_Impl,
-+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
-+ public virtual _TAO_IRObject_ThruPOA_Proxy_Impl
-+
- {
- public:
-- friend class POA_IR::Container;
-- TAO_ServerRequestInfo_IR_Container_create_struct (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
+ class TAO_ServerRequestInfo_IR_Container_create_struct : public TAO_ServerRequestInfo
+@@ -2285,7 +2203,7 @@
+ 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));
-+ _TAO_Container_ThruPOA_Proxy_Impl (void);
-
-- virtual Dynamic::ExceptionList * exceptions (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
-+ virtual ~_TAO_Container_ThruPOA_Proxy_Impl (void);
-
-- virtual CORBA::Any * result (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual IR_Contained_ptr lookup (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * search_name,
-+ CORBA::Environment &ACE_TRY_ENV
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Container_create_struct (const TAO_ServerRequestInfo_IR_Container_create_struct &);
-- void operator= (const TAO_ServerRequestInfo_IR_Container_create_struct &);
--
--private:
-- POA_IR::Container *_tao_impl;
-- const char * id_;
--const char * name_;
--const char * version_;
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -2327,10 +2245,10 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
-const IR::StructMemberSeq & members_;
--void result (IR::StructDef_ptr result);
-- // update the result
++ const IR_StructMemberSeq & members_;
+ void result (IR::StructDef_ptr result);
+ // update the result
-IR::StructDef_ptr _result;
--};
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_StructDef_ptr _result;
+ };
--class TAO_ServerRequestInfo_IR_Container_create_union : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Container;
-- TAO_ServerRequestInfo_IR_Container_create_union (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
+ class TAO_ServerRequestInfo_IR_Container_create_union : public TAO_ServerRequestInfo
+@@ -2344,8 +2262,8 @@
+ 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 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
-+ ));
-
-- virtual Dynamic::ParameterList * arguments (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ 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));
--
-- virtual Dynamic::ExceptionList * exceptions (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ 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));
--
-- virtual CORBA::Any * result (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Container_create_union (const TAO_ServerRequestInfo_IR_Container_create_union &);
-- void operator= (const TAO_ServerRequestInfo_IR_Container_create_union &);
--
--private:
-- POA_IR::Container *_tao_impl;
-- 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 ()
+ );
+@@ -2387,11 +2305,11 @@
+ 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_IDLType_ptr discriminator_type_;
++ const IR_UnionMemberSeq & members_;
+ void result (IR::UnionDef_ptr result);
+ // update the result
-IR::UnionDef_ptr _result;
--};
--
--class TAO_ServerRequestInfo_IR_Container_create_enum : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Container;
-- TAO_ServerRequestInfo_IR_Container_create_enum (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- 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
-+ ));
++ IR_UnionDef_ptr _result;
+ };
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-+ virtual IR_ModuleDef_ptr create_module (
-+ CORBA_Object *_collocated_tao_target_,
- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Container_create_enum (const TAO_ServerRequestInfo_IR_Container_create_enum &);
-- void operator= (const TAO_ServerRequestInfo_IR_Container_create_enum &);
--
--private:
-- POA_IR::Container *_tao_impl;
-- const char * id_;
--const char * name_;
--const char * version_;
+ class TAO_ServerRequestInfo_IR_Container_create_enum : public TAO_ServerRequestInfo
+@@ -2405,7 +2323,7 @@
+ 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 ()
+ );
+@@ -2447,10 +2365,10 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
-const IR::EnumMemberSeq & members_;
--void result (IR::EnumDef_ptr result);
-- // update the result
++ const IR_EnumMemberSeq & members_;
+ void result (IR::EnumDef_ptr result);
+ // update the result
-IR::EnumDef_ptr _result;
--};
-+ const char * name,
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class TAO_ServerRequestInfo_IR_Container_create_alias : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Container;
-- TAO_ServerRequestInfo_IR_Container_create_alias (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
-- IR::IDLType_ptr original_type,
-- CORBA::Environment &ACE_TRY_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
-+ ));
++ IR_EnumDef_ptr _result;
+ };
-- virtual Dynamic::ParameterList * arguments (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ 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));
--
-- virtual Dynamic::ExceptionList * exceptions (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ 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
- )
-- 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_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));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ virtual IR_AliasDef_ptr create_alias (
-+ CORBA_Object *_collocated_tao_target_,
- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Container_create_alias (const TAO_ServerRequestInfo_IR_Container_create_alias &);
-- void operator= (const TAO_ServerRequestInfo_IR_Container_create_alias &);
--
--private:
-- POA_IR::Container *_tao_impl;
-- const char * id_;
--const char * name_;
--const char * version_;
+ class TAO_ServerRequestInfo_IR_Container_create_alias : public TAO_ServerRequestInfo
+@@ -2464,7 +2382,7 @@
+ 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 ()
+ );
+@@ -2506,10 +2424,10 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
-IR::IDLType_ptr original_type_;
--void result (IR::AliasDef_ptr result);
-- // update the result
++ IR_IDLType_ptr original_type_;
+ void result (IR::AliasDef_ptr result);
+ // update the result
-IR::AliasDef_ptr _result;
--};
-+ const char * name,
-+ const char * version,
-+ IR_IDLType_ptr original_type,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_AliasDef_ptr _result;
+ };
--class TAO_ServerRequestInfo_IR_Container_create_interface : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Container;
-- TAO_ServerRequestInfo_IR_Container_create_interface (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
+ class TAO_ServerRequestInfo_IR_Container_create_interface : public TAO_ServerRequestInfo
+@@ -2523,7 +2441,7 @@
+ 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 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
-+ ));
-
-- virtual Dynamic::ParameterList * arguments (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ 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));
--
-- virtual Dynamic::ExceptionList * exceptions (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ 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
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ 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
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ virtual IR_NativeDef_ptr create_native (
-+ CORBA_Object *_collocated_tao_target_,
- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Container_create_interface (const TAO_ServerRequestInfo_IR_Container_create_interface &);
-- void operator= (const TAO_ServerRequestInfo_IR_Container_create_interface &);
--
--private:
-- POA_IR::Container *_tao_impl;
-- 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 =
+@@ -2567,12 +2485,12 @@
+ 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
++ 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;
-+ const char * name,
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
++ IR_InterfaceDef_ptr _result;
};
--class TAO_ServerRequestInfo_IR_Container_create_value : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Container;
-- TAO_ServerRequestInfo_IR_Container_create_value (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
-- const CORBA::Boolean & is_custom,
-- const CORBA::Boolean & is_abstract,
+ class TAO_ServerRequestInfo_IR_Container_create_value : public TAO_ServerRequestInfo
+@@ -2588,11 +2506,11 @@
+ const char * version,
+ const CORBA::Boolean & is_custom,
+ const CORBA::Boolean & is_abstract,
- IR::ValueDef_ptr base_value,
-- const CORBA::Boolean & is_truncatable,
++ 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));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Container_create_value (const TAO_ServerRequestInfo_IR_Container_create_value &);
-- void operator= (const TAO_ServerRequestInfo_IR_Container_create_value &);
--
--private:
-- POA_IR::Container *_tao_impl;
-- const char * id_;
--const char * name_;
--const char * version_;
--const CORBA::Boolean & is_custom_;
--const CORBA::Boolean & is_abstract_;
++ const IR_ValueDefSeq & abstract_base_values,
++ const IR_InterfaceDefSeq & supported_interfaces,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -2636,14 +2554,14 @@
+ const char * version_;
+ const CORBA::Boolean & is_custom_;
+ const CORBA::Boolean & is_abstract_;
-IR::ValueDef_ptr base_value_;
--const CORBA::Boolean & is_truncatable_;
++ 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
++ 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;
--};
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
++ IR_ValueDef_ptr _result;
+ };
--class TAO_ServerRequestInfo_IR_Container_create_value_box : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Container;
-- TAO_ServerRequestInfo_IR_Container_create_value_box (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
+ class TAO_ServerRequestInfo_IR_Container_create_value_box : public TAO_ServerRequestInfo
+@@ -2657,7 +2575,7 @@
+ const char * id,
+ const char * name,
+ const char * version,
- IR::IDLType_ptr original_type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class Container_tie : public Container
-+ {
-+ public:
-+ Container_tie (T &t);
-+ // the T& ctor
-+ Container_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ Container_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ Container_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~Container_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ IR_Contained_ptr lookup (
-+ const char * search_name,
-+ 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 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Container_create_value_box (const TAO_ServerRequestInfo_IR_Container_create_value_box &);
-- void operator= (const TAO_ServerRequestInfo_IR_Container_create_value_box &);
--
--private:
-- POA_IR::Container *_tao_impl;
-- const char * id_;
--const char * name_;
--const char * version_;
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -2699,10 +2617,10 @@
+ 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_IDLType_ptr original_type_def_;
+ void result (IR::ValueBoxDef_ptr result);
+ // update the result
-IR::ValueBoxDef_ptr _result;
--};
-+ IR_ContainedSeq * contents (
-+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class TAO_ServerRequestInfo_IR_Container_create_exception : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Container;
-- TAO_ServerRequestInfo_IR_Container_create_exception (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
-- const IR::StructMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_ContainedSeq * lookup_name (
-+ const char * search_name,
-+ CORBA::Long levels_to_search,
-+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_ValueBoxDef_ptr _result;
+ };
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Container_create_exception (const TAO_ServerRequestInfo_IR_Container_create_exception &);
-- void operator= (const TAO_ServerRequestInfo_IR_Container_create_exception &);
--
--private:
-- POA_IR::Container *_tao_impl;
-- const char * id_;
--const char * name_;
--const char * version_;
+ class TAO_ServerRequestInfo_IR_Container_create_exception : public TAO_ServerRequestInfo
+@@ -2716,7 +2634,7 @@
+ 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 ()
+ );
+@@ -2758,10 +2676,10 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
-const IR::StructMemberSeq & members_;
--void result (IR::ExceptionDef_ptr result);
-- // update the result
++ const IR_StructMemberSeq & members_;
+ void result (IR::ExceptionDef_ptr result);
+ // update the result
-IR::ExceptionDef_ptr _result;
--};
-+ 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
-+ ));
-
--class TAO_ServerRequestInfo_IR_Container_create_native : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Container;
-- TAO_ServerRequestInfo_IR_Container_create_native (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Container *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
-+
-+ 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
-+ ));
-+
-+ 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
-+ ));
-+
-+ 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
-+ ));
-+
-+ 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
-+ ));
-+
-+ 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
-+ ));
-+
-+ 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
-+ ));
-+
-+ 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
-+ ));
-+
-+ 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
-+ ));
-+
-+ 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
-+ ));
-+
-+ 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
-+ ));
-+
-+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ void destroy (
-+ 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 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Container_create_native (const TAO_ServerRequestInfo_IR_Container_create_native &);
-- void operator= (const TAO_ServerRequestInfo_IR_Container_create_native &);
--
- private:
-- POA_IR::Container *_tao_impl;
-- const char * id_;
--const char * name_;
--const char * version_;
--void result (IR::NativeDef_ptr result);
-- // update the result
++ IR_ExceptionDef_ptr _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_Container_create_native : public TAO_ServerRequestInfo
+@@ -2818,27 +2736,26 @@
+ const char * version_;
+ void result (IR::NativeDef_ptr result);
+ // update the result
-IR::NativeDef_ptr _result;
--};
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-+
-+ // copy and assignment are not allowed
-+ Container_tie (const Container_tie &);
-+ void operator= (const Container_tie &);
-+ };
-
--#endif /* TAO_HAS_INTERCEPTORS */
-+#endif /* ACE_HAS_USING_KEYWORD */
-+
-+ class IDLType;
-+ typedef IDLType *IDLType_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_IDLType_ThruPOA_Proxy_Impl;
-+ class _TAO_IDLType_Strategized_Proxy_Broker;
-+
-+ class IDLType : public virtual POA_CORBA_IRObject
-+ {
-+ protected:
-+ IDLType (void);
-+
-+ public:
-+ IDLType (const IDLType& rhs);
-+ virtual ~IDLType (void);
-+
-+
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-+
-+ virtual void* _downcast (
-+ 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 ()
-+ );
-+
-+ static void _non_existent_skel (
-+ 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 ()
-+ );
-+
-+ IR_IDLType *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-+
-+ virtual const char* _interface_repository_id (void) const;
-+
-+ virtual CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-+
-+ static void _get_type_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_NativeDef_ptr _result;
+ };
--};
+ #endif /* TAO_HAS_INTERCEPTORS */
-+ };
+ };
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Declaration
//
--class _TAO_Container_Strategized_Proxy_Broker : public virtual ::IR::_TAO_Container_Proxy_Broker
-+class _TAO_IDLType_Strategized_Proxy_Broker : public virtual _TAO_IDLType_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_Container_Strategized_Proxy_Broker : public virtual ::IR::_TAO_Container_Proxy_Broker
++class _TAO_Container_Strategized_Proxy_Broker : public virtual _TAO_Container_Proxy_Broker
{
public:
-- _TAO_Container_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_Container_Strategized_Proxy_Broker (void);
--
+ _TAO_Container_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_Container_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_Container_Proxy_Impl &select_proxy (
- ::IR::Container *object,
-+ _TAO_IDLType_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_IDLType_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_IDLType_Proxy_Impl &select_proxy (
-+ IR_IDLType *object,
++ virtual _TAO_Container_Proxy_Impl &select_proxy (
++ IR_Container *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -2856,7 +1784,7 @@
+@@ -2856,7 +2773,7 @@
// 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.
- ::IR::_TAO_Container_Proxy_Impl
-+ _TAO_IDLType_Proxy_Impl
++ _TAO_Container_Proxy_Impl
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -2865,10 +1793,9 @@
- // interface.
-
- public:
-- static _TAO_Container_Strategized_Proxy_Broker *the_TAO_Container_Strategized_Proxy_Broker (void);
-+ static _TAO_IDLType_Strategized_Proxy_Broker *the_TAO_IDLType_Strategized_Proxy_Broker (void);
+@@ -2868,7 +2785,6 @@
+ static _TAO_Container_Strategized_Proxy_Broker *the_TAO_Container_Strategized_Proxy_Broker (void);
};
-
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-@@ -2878,614 +1805,447 @@
+@@ -2878,10 +2794,10 @@
// ThruPOA Impl. Declaration
//
--class _TAO_Container_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_Container_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_Container_Proxy_Impl,
-+class _TAO_IDLType_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_IDLType_Proxy_Impl,
++class _TAO_Container_ThruPOA_Proxy_Impl :
++ public virtual _TAO_Container_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl,
- public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
+ public virtual _TAO_IRObject_ThruPOA_Proxy_Impl
{
public:
-- _TAO_Container_ThruPOA_Proxy_Impl (void);
-+ _TAO_IDLType_ThruPOA_Proxy_Impl (void);
+@@ -2889,7 +2805,7 @@
-- virtual ~_TAO_Container_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_IDLType_ThruPOA_Proxy_Impl (void);
+ virtual ~_TAO_Container_ThruPOA_Proxy_Impl (void) { }
- virtual IR::Contained_ptr lookup (
-+ virtual CORBA::TypeCode_ptr type (
++ virtual IR_Contained_ptr lookup (
CORBA_Object *_collocated_tao_target_,
-- const char * search_name,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
+ const char * search_name,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -2898,9 +2814,9 @@
CORBA::SystemException
));
- virtual IR::ContainedSeq * contents (
-- CORBA_Object *_collocated_tao_target_,
++ 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
-- ));
-+};
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -2908,11 +2824,11 @@
+ CORBA::SystemException
+ ));
- virtual IR::ContainedSeq * lookup_name (
-- CORBA_Object *_collocated_tao_target_,
-- const char * search_name,
-- CORBA::Long levels_to_search,
++ 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
-- ));
--
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -2920,9 +2836,9 @@
+ CORBA::SystemException
+ ));
+
- virtual IR::Container::DescriptionSeq * describe_contents (
-- CORBA_Object *_collocated_tao_target_,
++ 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
-- ));
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Long max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -2931,7 +2847,7 @@
+ 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
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
++ virtual IR_ModuleDef_ptr create_module (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+@@ -2942,12 +2858,12 @@
+ CORBA::SystemException
+ ));
- virtual IR::ConstantDef_ptr create_constant (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class IDLType_tie : public IDLType
-+ {
-+ public:
-+ IDLType_tie (T &t);
-+ // the T& ctor
-+ IDLType_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ IDLType_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ IDLType_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~IDLType_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr type,
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -2955,61 +2871,61 @@
+ CORBA::SystemException
+ ));
- virtual IR::StructDef_ptr create_struct (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_StructMemberSeq & members,
+ 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,
++ 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
-- ));
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ 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 (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
++ const IR_EnumMemberSeq & members,
+ 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,
++ 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
-- ));
-+ // copy and assignment are not allowed
-+ IDLType_tie (const IDLType_tie &);
-+ void operator= (const IDLType_tie &);
-+ };
++ IR_IDLType_ptr original_type,
+ 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,
++ 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
-- ));
-+#endif /* ACE_HAS_USING_KEYWORD */
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -3018,49 +2934,49 @@
+ CORBA::SystemException
+ ));
- 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,
++ 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,
++ 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
-- ));
-+ class Repository;
-+ typedef Repository *Repository_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_Repository_ThruPOA_Proxy_Impl;
-+ class _TAO_Repository_Strategized_Proxy_Broker;
++ 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 (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ class Repository : public virtual Container
-+ {
-+ protected:
-+ Repository (void);
++ IR_IDLType_ptr original_type_def,
+ 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,
++ 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
-- ));
-+ public:
-+ Repository (const Repository& rhs);
-+ virtual ~Repository (void);
++ const IR_StructMemberSeq & members,
+ 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
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-
--};
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
-
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
-+ static void _is_a_skel (
-+ 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 ()
-+ );
++ virtual IR_NativeDef_ptr create_native (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+@@ -3078,11 +2994,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class Container_tie : public Container
--{
--public:
-- Container_tie (T &t);
-- // the T& ctor
-- Container_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- Container_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- Container_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~Container_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
+-
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export Container_tie : public Container
++ class Container_tie : public Container
+ {
+ public:
+ Container_tie (T &t);
+@@ -3110,10 +3025,10 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
- IR::Contained_ptr lookup (
-- const char * search_name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual void _dispatch (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ IR_Contained_ptr lookup (
+ const char * search_name,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -3122,8 +3037,8 @@
+ CORBA::SystemException
+ ));
- IR::ContainedSeq * contents (
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_Repository *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ IR_ContainedSeq * contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -3132,10 +3047,10 @@
+ CORBA::SystemException
+ ));
- IR::ContainedSeq * lookup_name (
-- const char * search_name,
-- CORBA::Long levels_to_search,
++ IR_ContainedSeq * lookup_name (
+ const char * search_name,
+ CORBA::Long levels_to_search,
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual const char* _interface_repository_id (void) const;
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -3144,8 +3059,8 @@
+ CORBA::SystemException
+ ));
- 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_Contained_ptr lookup_id (
-+ const char * search_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ IR_Container::DescriptionSeq * describe_contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Long max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -3155,7 +3070,7 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
-+ static void lookup_id_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ IR_ModuleDef_ptr create_module (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -3166,11 +3081,11 @@
+ CORBA::SystemException
+ ));
- IR::ConstantDef_ptr create_constant (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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 CORBA::TypeCode_ptr get_canonical_typecode (
-+ CORBA::TypeCode_ptr tc,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ IR_IDLType_ptr type,
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -3179,11 +3094,11 @@
+ CORBA::SystemException
+ ));
- IR::StructDef_ptr create_struct (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ static void get_canonical_typecode_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -3191,12 +3106,12 @@
+ CORBA::SystemException
+ ));
- IR::UnionDef_ptr create_union (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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_PrimitiveDef_ptr get_primitive (
-+ IR_PrimitiveKind kind,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ IR_IDLType_ptr discriminator_type,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -3204,11 +3119,11 @@
+ CORBA::SystemException
+ ));
- IR::EnumDef_ptr create_enum (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ static void get_primitive_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -3216,11 +3131,11 @@
+ CORBA::SystemException
+ ));
- IR::AliasDef_ptr create_alias (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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_StringDef_ptr create_string (
-+ CORBA::ULong bound,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ IR_IDLType_ptr original_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -3228,11 +3143,11 @@
+ CORBA::SystemException
+ ));
- IR::InterfaceDef_ptr create_interface (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ static void create_string_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -3242,17 +3157,17 @@
+ CORBA::SystemException
+ ));
- 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 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,
++ 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_WstringDef_ptr create_wstring (
-+ CORBA::ULong bound,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ const IR_ValueDefSeq & abstract_base_values,
++ const IR_InterfaceDefSeq & supported_interfaces,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -3260,11 +3175,11 @@
+ CORBA::SystemException
+ ));
- IR::ValueBoxDef_ptr create_value_box (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ static void create_wstring_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -3272,11 +3187,11 @@
+ CORBA::SystemException
+ ));
- IR::ExceptionDef_ptr create_exception (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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_SequenceDef_ptr create_sequence (
-+ CORBA::ULong bound,
-+ IR_IDLType_ptr element_type,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -3284,7 +3199,7 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
-+ static void create_sequence_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ IR_NativeDef_ptr create_native (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -3295,7 +3210,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual IR_ArrayDef_ptr create_array (
-+ CORBA::ULong length,
-+ IR_IDLType_ptr element_type,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_array_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- Container_tie (const Container_tie &);
-- void operator= (const Container_tie &);
--};
-+ virtual IR_FixedDef_ptr create_fixed (
-+ CORBA::UShort digits,
-+ CORBA::Short scale,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--#endif /* ACE_HAS_USING_KEYWORD */
-+ static void create_fixed_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--class IDLType;
--typedef IDLType *IDLType_ptr;
--// Forward Classes Declaration
--class _TAO_IDLType_ThruPOA_Proxy_Impl;
--class _TAO_IDLType_Strategized_Proxy_Broker;
-+ static void lookup_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--class IDLType : public virtual POA_CORBA::IRObject
--{
--protected:
-- IDLType (void);
-+ static void contents_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--public:
-- IDLType (const IDLType& rhs);
-- virtual ~IDLType (void);
-+ static void lookup_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void describe_contents_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_module_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+ static void create_constant_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_struct_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_union_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -3329,7 +3244,7 @@
+ class _TAO_IDLType_ThruPOA_Proxy_Impl;
+ class _TAO_IDLType_Strategized_Proxy_Broker;
-- virtual void _dispatch (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_enum_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+-class TAO_IFR_Client_Export IDLType : public virtual POA_CORBA::IRObject
++ class IDLType : public virtual POA_CORBA_IRObject
+ {
+ protected:
+ IDLType (void);
+@@ -3372,7 +3287,7 @@
+ TAO_default_environment ()
+ );
- ::IR::IDLType *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_alias_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- virtual const char* _interface_repository_id (void) const;
-+ static void create_interface_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- virtual CORBA::TypeCode_ptr type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void create_value_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_type_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ IR_IDLType *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -3399,7 +3314,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
--
--#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_ServerRequestInfo_IR_IDLType_type_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::IDLType;
-- TAO_ServerRequestInfo_IR_IDLType_type_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::IDLType *tao_impl
-- ,
-- 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 =
-+ static void create_value_box_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-- CORBA::Environment &ACE_TRY_ENV =
-+ );
-+
-+ static void create_exception_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_IDLType_type_get (const TAO_ServerRequestInfo_IR_IDLType_type_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_IDLType_type_get &);
--
-- private:
-- POA_IR::IDLType *_tao_impl;
-- void result (CORBA::TypeCode_ptr result);
-- // update the result
--CORBA::TypeCode_ptr _result;
--};
-+ );
+ TAO_default_environment ()
+ );
--#endif /* TAO_HAS_INTERCEPTORS */
-+ static void create_native_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -3407,7 +3322,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
--};
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+@@ -3472,20 +3387,19 @@
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
+ };
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Declaration
//
--class _TAO_IDLType_Strategized_Proxy_Broker : public virtual ::IR::_TAO_IDLType_Proxy_Broker
-+class _TAO_Repository_Strategized_Proxy_Broker : public virtual _TAO_Repository_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_IDLType_Strategized_Proxy_Broker : public virtual ::IR::_TAO_IDLType_Proxy_Broker
++class _TAO_IDLType_Strategized_Proxy_Broker : public virtual _TAO_IDLType_Proxy_Broker
{
public:
-- _TAO_IDLType_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_IDLType_Strategized_Proxy_Broker (void);
--
+ _TAO_IDLType_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_IDLType_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_IDLType_Proxy_Impl &select_proxy (
- ::IR::IDLType *object,
-+ _TAO_Repository_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_Repository_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_Repository_Proxy_Impl &select_proxy (
-+ IR_Repository *object,
++ virtual _TAO_IDLType_Proxy_Impl &select_proxy (
++ IR_IDLType *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -3503,7 +2263,7 @@
+@@ -3503,7 +3417,7 @@
// 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.
- ::IR::_TAO_IDLType_Proxy_Impl
-+ _TAO_Repository_Proxy_Impl
++ _TAO_IDLType_Proxy_Impl
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -3512,10 +2272,9 @@
- // interface.
-
- public:
-- static _TAO_IDLType_Strategized_Proxy_Broker *the_TAO_IDLType_Strategized_Proxy_Broker (void);
-+ static _TAO_Repository_Strategized_Proxy_Broker *the_TAO_Repository_Strategized_Proxy_Broker (void);
+@@ -3515,7 +3429,6 @@
+ static _TAO_IDLType_Strategized_Proxy_Broker *the_TAO_IDLType_Strategized_Proxy_Broker (void);
};
-
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-@@ -3525,1787 +2284,1457 @@
+@@ -3525,10 +3438,10 @@
// ThruPOA Impl. Declaration
//
--class _TAO_IDLType_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_IDLType_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_IDLType_Proxy_Impl,
-+class _TAO_Repository_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_Repository_Proxy_Impl,
++class _TAO_IDLType_ThruPOA_Proxy_Impl :
++ public virtual _TAO_IDLType_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl,
- public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
-+ public virtual _TAO_Container_ThruPOA_Proxy_Impl
++ public virtual _TAO_IRObject_ThruPOA_Proxy_Impl
{
public:
-- _TAO_IDLType_ThruPOA_Proxy_Impl (void);
-+ _TAO_Repository_ThruPOA_Proxy_Impl (void);
-
-- virtual ~_TAO_IDLType_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_Repository_ThruPOA_Proxy_Impl (void);
-
-- virtual CORBA::TypeCode_ptr type (
-+ 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
- ));
+@@ -3551,11 +3464,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
--};
--
-
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
--
--
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class IDLType_tie : public IDLType
--{
--public:
-- IDLType_tie (T &t);
-- // the T& ctor
-- IDLType_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- IDLType_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- IDLType_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~IDLType_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- CORBA::TypeCode_ptr type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- IR::DefinitionKind def_kind (
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export IDLType_tie : public IDLType
++ class IDLType_tie : public IDLType
+ {
+ public:
+ IDLType_tie (T &t);
+@@ -3583,7 +3495,7 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ 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::Environment &env =
+ TAO_default_environment ()
+ );
+ CORBA::TypeCode_ptr type (
+@@ -3594,7 +3506,7 @@
CORBA::SystemException
));
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual IR_PrimitiveDef_ptr get_primitive (
-+ CORBA_Object *_collocated_tao_target_,
-+ IR_PrimitiveKind kind,
-+ CORBA::Environment &ACE_TRY_ENV
+- IR::DefinitionKind def_kind (
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
+@@ -3628,7 +3540,7 @@
+ class _TAO_Repository_ThruPOA_Proxy_Impl;
+ class _TAO_Repository_Strategized_Proxy_Broker;
+
+-class TAO_IFR_Client_Export Repository : public virtual Container
++ class Repository : public virtual Container
+ {
+ protected:
+ Repository (void);
+@@ -3671,14 +3583,14 @@
+ TAO_default_environment ()
+ );
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- IDLType_tie (const IDLType_tie &);
-- void operator= (const IDLType_tie &);
--};
--
--#endif /* ACE_HAS_USING_KEYWORD */
--
--class Repository;
--typedef Repository *Repository_ptr;
--// Forward Classes Declaration
--class _TAO_Repository_ThruPOA_Proxy_Impl;
--class _TAO_Repository_Strategized_Proxy_Broker;
--
--class Repository : public virtual Container
--{
--protected:
-- Repository (void);
--
--public:
-- Repository (const Repository& rhs);
-- virtual ~Repository (void);
--
--
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual void* _downcast (
-- 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 ()
-- );
--
-- static void _non_existent_skel (
-- 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 ()
-- );
--
- ::IR::Repository *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual const char* _interface_repository_id (void) const;
--
++ IR_Repository *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+
+ virtual const char* _interface_repository_id (void) const;
+
- virtual IR::Contained_ptr lookup_id (
-- const char * search_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
-- static void lookup_id_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual CORBA::TypeCode_ptr get_canonical_typecode (
-- CORBA::TypeCode_ptr tc,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
-- static void get_canonical_typecode_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
++ virtual IR_Contained_ptr lookup_id (
+ const char * search_id,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -3712,8 +3624,8 @@
+ TAO_default_environment ()
+ );
+
- virtual IR::PrimitiveDef_ptr get_primitive (
- IR::PrimitiveKind kind,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
-- static void get_primitive_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
++ virtual IR_PrimitiveDef_ptr get_primitive (
++ IR_PrimitiveKind kind,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -3729,7 +3641,7 @@
+ TAO_default_environment ()
+ );
+
- virtual IR::StringDef_ptr create_string (
-+ virtual IR_StringDef_ptr create_string (
-+ CORBA_Object *_collocated_tao_target_,
++ virtual IR_StringDef_ptr create_string (
CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
-- )) = 0;
--
-- static void create_string_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ ));
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -3746,7 +3658,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::WstringDef_ptr create_wstring (
-+ virtual IR_WstringDef_ptr create_wstring (
-+ CORBA_Object *_collocated_tao_target_,
++ virtual IR_WstringDef_ptr create_wstring (
CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
-- )) = 0;
--
-- static void create_wstring_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ ));
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -3763,9 +3675,9 @@
+ TAO_default_environment ()
+ );
- virtual IR::SequenceDef_ptr create_sequence (
-+ virtual IR_SequenceDef_ptr create_sequence (
-+ CORBA_Object *_collocated_tao_target_,
++ virtual IR_SequenceDef_ptr create_sequence (
CORBA::ULong bound,
- IR::IDLType_ptr element_type,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ IR_IDLType_ptr element_type,
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
-- )) = 0;
--
-- static void create_sequence_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ ));
+@@ -3781,9 +3693,9 @@
+ TAO_default_environment ()
+ );
- virtual IR::ArrayDef_ptr create_array (
-+ virtual IR_ArrayDef_ptr create_array (
-+ CORBA_Object *_collocated_tao_target_,
++ virtual IR_ArrayDef_ptr create_array (
CORBA::ULong length,
- IR::IDLType_ptr element_type,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ IR_IDLType_ptr element_type,
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
-- )) = 0;
--
-- static void create_array_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ ));
+@@ -3799,7 +3711,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::FixedDef_ptr create_fixed (
-+ virtual IR_FixedDef_ptr create_fixed (
-+ CORBA_Object *_collocated_tao_target_,
++ virtual IR_FixedDef_ptr create_fixed (
CORBA::UShort digits,
CORBA::Short scale,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
-- )) = 0;
-+ ));
-
-- static void create_fixed_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+};
-
-- static void lookup_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -3821,7 +3733,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void contents_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -3829,7 +3741,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void lookup_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -3837,7 +3749,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class Repository_tie : public virtual Repository,
-+ public virtual PortableServer::RefCountServantBase
-+ {
-+ public:
-+ Repository_tie (T &t);
-+ // the T& ctor
-+ Repository_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ Repository_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ Repository_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~Repository_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ IR_Contained_ptr lookup_id (
-+ const char * search_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void describe_contents_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -3845,7 +3757,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ CORBA::TypeCode_ptr get_canonical_typecode (
-+ CORBA::TypeCode_ptr tc,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_module_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -3853,7 +3765,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_PrimitiveDef_ptr get_primitive (
-+ IR_PrimitiveKind kind,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_constant_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -3861,7 +3773,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_StringDef_ptr create_string (
-+ CORBA::ULong bound,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_struct_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -3869,7 +3781,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_WstringDef_ptr create_wstring (
-+ CORBA::ULong bound,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_union_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -3877,7 +3789,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_SequenceDef_ptr create_sequence (
-+ CORBA::ULong bound,
-+ IR_IDLType_ptr element_type,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_enum_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -3885,7 +3797,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_ArrayDef_ptr create_array (
-+ CORBA::ULong length,
-+ IR_IDLType_ptr element_type,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_alias_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -3893,7 +3805,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_FixedDef_ptr create_fixed (
-+ CORBA::UShort digits,
-+ CORBA::Short scale,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_interface_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -3901,7 +3813,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Contained_ptr lookup (
-+ const char * search_name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_value_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -3909,7 +3821,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_ContainedSeq * contents (
-+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_value_box_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -3917,7 +3829,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_ContainedSeq * lookup_name (
-+ const char * search_name,
-+ CORBA::Long levels_to_search,
-+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_exception_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -3925,7 +3837,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
-
-- static void create_native_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -3933,7 +3845,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
-
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -3941,7 +3853,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
-
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -3949,11 +3861,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-
--#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_ServerRequestInfo_IR_Repository_lookup_id : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::Repository;
-- TAO_ServerRequestInfo_IR_Repository_lookup_id (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Repository *tao_impl
-- ,
-- const char * search_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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 Dynamic::ParameterList * arguments (
-+ 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 Dynamic::ExceptionList * exceptions (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ 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 CORBA::Any * result (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ IR_ValueDef_ptr create_value (
- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_Repository_lookup_id (const TAO_ServerRequestInfo_IR_Repository_lookup_id &);
-- void operator= (const TAO_ServerRequestInfo_IR_Repository_lookup_id &);
--
-- private:
-- POA_IR::Repository *_tao_impl;
-- const char * search_id_;
--void result (IR::Contained_ptr result);
-- // update the result
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -4009,7 +3920,7 @@
+ const char * search_id_;
+ void result (IR::Contained_ptr result);
+ // update the result
-IR::Contained_ptr _result;
--};
-+ 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
-+ ));
-
--class TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Repository;
-- TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Repository *tao_impl
-- ,
-- CORBA::TypeCode_ptr tc,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
++ IR_Contained_ptr _result;
+ };
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode (const TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode &);
-- void operator= (const TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode &);
--
--private:
-- POA_IR::Repository *_tao_impl;
-- CORBA::TypeCode_ptr tc_;
--void result (CORBA::TypeCode_ptr result);
-- // update the result
--CORBA::TypeCode_ptr _result;
--};
-+ 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
-+ ));
-
--class TAO_ServerRequestInfo_IR_Repository_get_primitive : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Repository;
-- TAO_ServerRequestInfo_IR_Repository_get_primitive (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Repository *tao_impl
-- ,
+ class TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode : public TAO_ServerRequestInfo
+@@ -4073,7 +3984,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::Repository *tao_impl
+ ,
- IR::PrimitiveKind & kind,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Repository_get_primitive (const TAO_ServerRequestInfo_IR_Repository_get_primitive &);
-- void operator= (const TAO_ServerRequestInfo_IR_Repository_get_primitive &);
--
--private:
-- POA_IR::Repository *_tao_impl;
++ IR_PrimitiveKind & kind,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -4112,10 +4023,10 @@
+
+ private:
+ POA_IR::Repository *_tao_impl;
- const IR::PrimitiveKind & kind_;
--void result (IR::PrimitiveDef_ptr result);
-- // update the result
++ const IR_PrimitiveKind & kind_;
+ void result (IR::PrimitiveDef_ptr result);
+ // update the result
-IR::PrimitiveDef_ptr _result;
--};
-+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class TAO_ServerRequestInfo_IR_Repository_create_string : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Repository;
-- TAO_ServerRequestInfo_IR_Repository_create_string (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Repository *tao_impl
-- ,
-- const CORBA::ULong & bound,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void destroy (
-+ 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 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Repository_create_string (const TAO_ServerRequestInfo_IR_Repository_create_string &);
-- void operator= (const TAO_ServerRequestInfo_IR_Repository_create_string &);
--
- private:
-- POA_IR::Repository *_tao_impl;
-- const CORBA::ULong & bound_;
--void result (IR::StringDef_ptr result);
-- // update the result
++ IR_PrimitiveDef_ptr _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_Repository_create_string : public TAO_ServerRequestInfo
+@@ -4168,7 +4079,7 @@
+ const CORBA::ULong & bound_;
+ void result (IR::StringDef_ptr result);
+ // update the result
-IR::StringDef_ptr _result;
--};
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
++ IR_StringDef_ptr _result;
+ };
--class TAO_ServerRequestInfo_IR_Repository_create_wstring : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Repository;
-- TAO_ServerRequestInfo_IR_Repository_create_wstring (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Repository *tao_impl
-- ,
-- const CORBA::ULong & bound,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ // copy and assignment are not allowed
-+ Repository_tie (const Repository_tie &);
-+ void operator= (const Repository_tie &);
-+ };
-
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Repository_create_wstring (const TAO_ServerRequestInfo_IR_Repository_create_wstring &);
-- void operator= (const TAO_ServerRequestInfo_IR_Repository_create_wstring &);
--
--private:
-- POA_IR::Repository *_tao_impl;
-- const CORBA::ULong & bound_;
--void result (IR::WstringDef_ptr result);
-- // update the result
+ class TAO_ServerRequestInfo_IR_Repository_create_wstring : public TAO_ServerRequestInfo
+@@ -4221,7 +4132,7 @@
+ const CORBA::ULong & bound_;
+ void result (IR::WstringDef_ptr result);
+ // update the result
-IR::WstringDef_ptr _result;
--};
-+#endif /* ACE_HAS_USING_KEYWORD */
++ IR_WstringDef_ptr _result;
+ };
--class TAO_ServerRequestInfo_IR_Repository_create_sequence : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Repository;
-- TAO_ServerRequestInfo_IR_Repository_create_sequence (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Repository *tao_impl
-- ,
-- const CORBA::ULong & bound,
+ class TAO_ServerRequestInfo_IR_Repository_create_sequence : public TAO_ServerRequestInfo
+@@ -4233,7 +4144,7 @@
+ POA_IR::Repository *tao_impl
+ ,
+ const CORBA::ULong & bound,
- IR::IDLType_ptr element_type,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class ComponentRepository;
-+ typedef ComponentRepository *ComponentRepository_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
-+ class _TAO_ComponentRepository_Strategized_Proxy_Broker;
-
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Repository_create_sequence (const TAO_ServerRequestInfo_IR_Repository_create_sequence &);
-- void operator= (const TAO_ServerRequestInfo_IR_Repository_create_sequence &);
--
--private:
-- POA_IR::Repository *_tao_impl;
-- const CORBA::ULong & bound_;
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -4273,10 +4184,10 @@
+ private:
+ POA_IR::Repository *_tao_impl;
+ const CORBA::ULong & bound_;
-IR::IDLType_ptr element_type_;
--void result (IR::SequenceDef_ptr result);
-- // update the result
++ IR_IDLType_ptr element_type_;
+ void result (IR::SequenceDef_ptr result);
+ // update the result
-IR::SequenceDef_ptr _result;
--};
-+ class ComponentRepository : public virtual Repository
-+ {
-+ protected:
-+ ComponentRepository (void);
++ IR_SequenceDef_ptr _result;
+ };
--class TAO_ServerRequestInfo_IR_Repository_create_array : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Repository;
-- TAO_ServerRequestInfo_IR_Repository_create_array (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Repository *tao_impl
-- ,
-- const CORBA::ULong & length,
+ class TAO_ServerRequestInfo_IR_Repository_create_array : public TAO_ServerRequestInfo
+@@ -4288,7 +4199,7 @@
+ POA_IR::Repository *tao_impl
+ ,
+ const CORBA::ULong & length,
- IR::IDLType_ptr element_type,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ public:
-+ ComponentRepository (const ComponentRepository& rhs);
-+ virtual ~ComponentRepository (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));
--
-- virtual CORBA::Any * result (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Repository_create_array (const TAO_ServerRequestInfo_IR_Repository_create_array &);
-- void operator= (const TAO_ServerRequestInfo_IR_Repository_create_array &);
--
--private:
-- POA_IR::Repository *_tao_impl;
-- const CORBA::ULong & length_;
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -4328,10 +4239,10 @@
+ private:
+ POA_IR::Repository *_tao_impl;
+ const CORBA::ULong & length_;
-IR::IDLType_ptr element_type_;
--void result (IR::ArrayDef_ptr result);
-- // update the result
++ IR_IDLType_ptr element_type_;
+ void result (IR::ArrayDef_ptr result);
+ // update the result
-IR::ArrayDef_ptr _result;
--};
++ IR_ArrayDef_ptr _result;
+ };
--class TAO_ServerRequestInfo_IR_Repository_create_fixed : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::Repository;
-- TAO_ServerRequestInfo_IR_Repository_create_fixed (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::Repository *tao_impl
-- ,
-- const CORBA::UShort & digits,
-- const CORBA::Short & scale,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_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));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_Repository_create_fixed (const TAO_ServerRequestInfo_IR_Repository_create_fixed &);
-- void operator= (const TAO_ServerRequestInfo_IR_Repository_create_fixed &);
--
--private:
-- POA_IR::Repository *_tao_impl;
-- const CORBA::UShort & digits_;
--const CORBA::Short & scale_;
--void result (IR::FixedDef_ptr result);
-- // update the result
+ class TAO_ServerRequestInfo_IR_Repository_create_fixed : public TAO_ServerRequestInfo
+@@ -4386,27 +4297,26 @@
+ const CORBA::Short & scale_;
+ void result (IR::FixedDef_ptr result);
+ // update the result
-IR::FixedDef_ptr _result;
--};
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
-
--#endif /* TAO_HAS_INTERCEPTORS */
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ IR_FixedDef_ptr _result;
+ };
--};
-+ static void _non_existent_skel (
-+ 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 ()
-+ );
-
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Declaration
--//
-+ IR_ComponentRepository *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+ #endif /* TAO_HAS_INTERCEPTORS */
--class _TAO_Repository_Strategized_Proxy_Broker : public virtual ::IR::_TAO_Repository_Proxy_Broker
--{
--public:
-- _TAO_Repository_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_Repository_Strategized_Proxy_Broker (void);
--
+ };
+
+-
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Declaration
+ //
+
+-class TAO_IFR_Client_Export _TAO_Repository_Strategized_Proxy_Broker : public virtual ::IR::_TAO_Repository_Proxy_Broker
++class _TAO_Repository_Strategized_Proxy_Broker : public virtual _TAO_Repository_Proxy_Broker
+ {
+ public:
+ _TAO_Repository_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_Repository_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_Repository_Proxy_Impl &select_proxy (
- ::IR::Repository *object,
-- CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-- );
-+ virtual const char* _interface_repository_id (void) const;
-
--private:
-+ 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,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--// 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
-- );
-+ static void create_component_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ virtual _TAO_Repository_Proxy_Impl &select_proxy (
++ IR_Repository *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
--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.
+@@ -4424,7 +4334,7 @@
+ // 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.
- ::IR::_TAO_Repository_Proxy_Impl
-- *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
--
-- TAO_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.
-+ 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,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ _TAO_Repository_Proxy_Impl
+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
+
+ TAO_SYNCH_MUTEX mutex_;
+@@ -4436,7 +4346,6 @@
+ static _TAO_Repository_Strategized_Proxy_Broker *the_TAO_Repository_Strategized_Proxy_Broker (void);
+ };
--public:
-- static _TAO_Repository_Strategized_Proxy_Broker *the_TAO_Repository_Strategized_Proxy_Broker (void);
--};
-+ static void create_home_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-+ static void lookup_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--//
--// End Strategized Proxy Broker Declaration
--///////////////////////////////////////////////////////////////////////
-+ static void get_canonical_typecode_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void get_primitive_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Impl. Declaration
--//
-+ static void create_string_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--class _TAO_Repository_ThruPOA_Proxy_Impl :
+-
+ //
+ // End Strategized Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -4446,10 +4355,10 @@
+ // ThruPOA Impl. Declaration
+ //
+
+-class TAO_IFR_Client_Export _TAO_Repository_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_Repository_Proxy_Impl,
-- public virtual TAO_ThruPOA_Object_Proxy_Impl,
++class _TAO_Repository_ThruPOA_Proxy_Impl :
++ public virtual _TAO_Repository_Proxy_Impl,
+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
- public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl
--
--{
--public:
-- _TAO_Repository_ThruPOA_Proxy_Impl (void);
--
-- virtual ~_TAO_Repository_ThruPOA_Proxy_Impl (void) { }
--
++ public virtual _TAO_Container_ThruPOA_Proxy_Impl
+
+ {
+ public:
+@@ -4457,7 +4366,7 @@
+
+ virtual ~_TAO_Repository_ThruPOA_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
-- ));
-+ static void create_wstring_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- 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
-- ));
-+ static void create_sequence_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ virtual IR_Contained_ptr lookup_id (
+ CORBA_Object *_collocated_tao_target_,
+ const char * search_id,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -4475,16 +4384,16 @@
+ CORBA::SystemException
+ ));
- virtual IR::PrimitiveDef_ptr get_primitive (
-- CORBA_Object *_collocated_tao_target_,
++ virtual IR_PrimitiveDef_ptr get_primitive (
+ CORBA_Object *_collocated_tao_target_,
- IR::PrimitiveKind kind,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_array_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ 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
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_fixed_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ 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
+@@ -4493,7 +4402,7 @@
+ CORBA::SystemException
+ ));
- virtual IR::WstringDef_ptr create_wstring (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void lookup_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ 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
+@@ -4502,27 +4411,27 @@
+ CORBA::SystemException
+ ));
- virtual IR::SequenceDef_ptr create_sequence (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::ULong bound,
++ 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
-- ));
-+ static void contents_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
- virtual IR::ArrayDef_ptr create_array (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::ULong length,
++ 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
-- ));
-+ static void lookup_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_IDLType_ptr element_type,
+ 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
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void describe_contents_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--};
-+ static void create_module_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_constant_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_struct_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_union_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_enum_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_alias_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_interface_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_value_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_value_box_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_exception_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_native_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
-
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Declaration
- //
--// ThruPOA Proxy Impl. Declaration
-+
-+class _TAO_ComponentRepository_Strategized_Proxy_Broker : public virtual _TAO_ComponentRepository_Proxy_Broker
-+{
-+public:
-+ _TAO_ComponentRepository_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_ComponentRepository_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_ComponentRepository_Proxy_Impl &select_proxy (
-+ IR_ComponentRepository *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_ComponentRepository_Proxy_Impl
-+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-+
-+ TAO_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:
-+ static _TAO_ComponentRepository_Strategized_Proxy_Broker *the_TAO_ComponentRepository_Strategized_Proxy_Broker (void);
-+};
-+
-+//
-+// End Strategized Proxy Broker Declaration
++ virtual IR_FixedDef_ptr create_fixed (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::UShort digits,
+ CORBA::Short scale,
+@@ -4539,11 +4448,11 @@
+ // ThruPOA Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class Repository_tie : public Repository
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Impl. Declaration
-+//
-+
-+class _TAO_ComponentRepository_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_ComponentRepository_Proxy_Impl,
-+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl
-+
+-
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export Repository_tie : public Repository
++ class Repository_tie : public virtual Repository,
++ public virtual PortableServer::RefCountServantBase
{
public:
-- Repository_tie (T &t);
-- // the T& ctor
-- Repository_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- Repository_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- Repository_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~Repository_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
+ Repository_tie (T &t);
+@@ -4571,10 +4480,10 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
- IR::Contained_ptr lookup_id (
-- const char * search_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ _TAO_ComponentRepository_ThruPOA_Proxy_Impl (void);
-+
-+ virtual ~_TAO_ComponentRepository_ThruPOA_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 ((
++ IR_Contained_ptr lookup_id (
+ const char * search_id,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -4592,8 +4501,8 @@
CORBA::SystemException
));
-- CORBA::TypeCode_ptr get_canonical_typecode (
-- CORBA::TypeCode_ptr tc,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ 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
+- IR::PrimitiveDef_ptr get_primitive (
+- IR::PrimitiveKind kind,
++ IR_PrimitiveDef_ptr get_primitive (
++ IR_PrimitiveKind kind,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -4601,7 +4510,7 @@
CORBA::SystemException
));
-+};
-
-- IR::PrimitiveDef_ptr get_primitive (
-- IR::PrimitiveKind kind,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
- IR::StringDef_ptr create_string (
-- CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
++ IR_StringDef_ptr create_string (
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -4610,7 +4519,7 @@
+ CORBA::SystemException
+ ));
- IR::WstringDef_ptr create_wstring (
-- CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class ComponentRepository_tie
-+ : public virtual ComponentRepository,
-+ public virtual PortableServer::RefCountServantBase
-+ {
-+ public:
-+ ComponentRepository_tie (T &t);
-+ // the T& ctor
-+ ComponentRepository_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ ComponentRepository_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ ComponentRepository_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~ComponentRepository_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ IR_ComponentDef_ptr create_component (
-+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_WstringDef_ptr create_wstring (
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -4619,9 +4528,9 @@
+ CORBA::SystemException
+ ));
- IR::SequenceDef_ptr create_sequence (
-- CORBA::ULong bound,
++ IR_SequenceDef_ptr create_sequence (
+ CORBA::ULong bound,
- IR::IDLType_ptr element_type,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -4629,9 +4538,9 @@
+ CORBA::SystemException
+ ));
- IR::ArrayDef_ptr create_array (
-- CORBA::ULong length,
++ IR_ArrayDef_ptr create_array (
+ CORBA::ULong length,
- IR::IDLType_ptr element_type,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_Contained_ptr lookup_id (
-+ const char * search_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -4639,7 +4548,7 @@
+ CORBA::SystemException
+ ));
- IR::FixedDef_ptr create_fixed (
-- CORBA::UShort digits,
-- CORBA::Short scale,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ CORBA::TypeCode_ptr get_canonical_typecode (
-+ CORBA::TypeCode_ptr tc,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_FixedDef_ptr create_fixed (
+ CORBA::UShort digits,
+ CORBA::Short scale,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -4649,7 +4558,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained_ptr lookup (
-- const char * search_name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_PrimitiveDef_ptr get_primitive (
-+ IR_PrimitiveKind kind,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Contained_ptr lookup (
+ const char * search_name,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -4658,8 +4567,8 @@
+ CORBA::SystemException
+ ));
- IR::ContainedSeq * contents (
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_StringDef_ptr create_string (
-+ CORBA::ULong bound,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_ContainedSeq * contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -4668,10 +4577,10 @@
+ CORBA::SystemException
+ ));
- IR::ContainedSeq * lookup_name (
-- const char * search_name,
-- CORBA::Long levels_to_search,
++ IR_ContainedSeq * lookup_name (
+ const char * search_name,
+ CORBA::Long levels_to_search,
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_WstringDef_ptr create_wstring (
-+ CORBA::ULong bound,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -4680,8 +4589,8 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
-+ IR_SequenceDef_ptr create_sequence (
-+ CORBA::ULong bound,
-+ IR_IDLType_ptr element_type,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Container::DescriptionSeq * describe_contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Long max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -4691,7 +4600,7 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
-+ IR_ArrayDef_ptr create_array (
-+ CORBA::ULong length,
-+ IR_IDLType_ptr element_type,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_ModuleDef_ptr create_module (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -4702,11 +4611,11 @@
+ CORBA::SystemException
+ ));
- IR::ConstantDef_ptr create_constant (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ IR_FixedDef_ptr create_fixed (
-+ CORBA::UShort digits,
-+ CORBA::Short scale,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr type,
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -4715,11 +4624,11 @@
+ CORBA::SystemException
+ ));
- IR::StructDef_ptr create_struct (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ IR_Contained_ptr lookup (
-+ const char * search_name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -4727,12 +4636,12 @@
+ CORBA::SystemException
+ ));
- IR::UnionDef_ptr create_union (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ IR_ContainedSeq * contents (
-+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr discriminator_type,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -4740,11 +4649,11 @@
+ CORBA::SystemException
+ ));
- IR::EnumDef_ptr create_enum (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ IR_ContainedSeq * lookup_name (
-+ const char * search_name,
-+ CORBA::Long levels_to_search,
-+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -4752,11 +4661,11 @@
+ CORBA::SystemException
+ ));
- IR::AliasDef_ptr create_alias (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ 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
-+ ));
++ IR_IDLType_ptr original_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -4764,11 +4673,11 @@
+ CORBA::SystemException
+ ));
- IR::InterfaceDef_ptr create_interface (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ 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
-+ ));
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -4778,17 +4687,17 @@
+ CORBA::SystemException
+ ));
- 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 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,
++ 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
-- ));
-+ 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
-+ ));
-
-- 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
-- ));
-+ 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
-+ ));
-
-- 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
-- ));
-+ 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
-+ ));
-
-- 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
-- ));
-+ 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
-+ ));
-
-- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
-
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- Repository_tie (const Repository_tie &);
-- void operator= (const Repository_tie &);
--};
-+ 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
-+ ));
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -4796,11 +4705,11 @@
+ CORBA::SystemException
+ ));
--#endif /* ACE_HAS_USING_KEYWORD */
+- IR::ValueBoxDef_ptr create_value_box (
+ IR_ValueBoxDef_ptr create_value_box (
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class ComponentRepository;
--typedef ComponentRepository *ComponentRepository_ptr;
--// Forward Classes Declaration
--class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
--class _TAO_ComponentRepository_Strategized_Proxy_Broker;
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -4808,11 +4717,11 @@
+ CORBA::SystemException
+ ));
+
+- IR::ExceptionDef_ptr create_exception (
+ IR_ExceptionDef_ptr create_exception (
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class ComponentRepository : public virtual Repository
--{
--protected:
-- ComponentRepository (void);
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -4820,7 +4729,7 @@
+ CORBA::SystemException
+ ));
+
+- IR::NativeDef_ptr create_native (
+ 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
-+ ));
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -4831,7 +4740,7 @@
+ CORBA::SystemException
+ ));
--public:
-- ComponentRepository (const ComponentRepository& rhs);
-- virtual ~ComponentRepository (void);
+- IR::DefinitionKind def_kind (
+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+ // copy and assignment are not allowed
-+ ComponentRepository_tie (const ComponentRepository_tie &);
-+ void operator= (const ComponentRepository_tie &);
-+ };
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+#endif /* ACE_HAS_USING_KEYWORD */
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -4865,7 +4774,7 @@
+ class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
+ class _TAO_ComponentRepository_Strategized_Proxy_Broker;
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class ModuleDef;
-+ typedef ModuleDef *ModuleDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_ModuleDef_ThruPOA_Proxy_Impl;
-+ class _TAO_ModuleDef_Strategized_Proxy_Broker;
-
-- virtual void _dispatch (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class ModuleDef : public virtual Container,
-+ public virtual Contained
-+ {
-+ protected:
-+ ModuleDef (void);
+-class TAO_IFR_Client_Export ComponentRepository : public virtual Repository
++ class ComponentRepository : public virtual Repository
+ {
+ protected:
+ ComponentRepository (void);
+@@ -4908,19 +4817,19 @@
+ TAO_default_environment ()
+ );
- ::IR::ComponentRepository *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ public:
-+ ModuleDef (const ModuleDef& rhs);
-+ virtual ~ModuleDef (void);
++ IR_ComponentRepository *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
-- virtual const char* _interface_repository_id (void) const;
+ virtual const char* _interface_repository_id (void) const;
- virtual IR::ComponentDef_ptr create_component (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_component_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
++ IR_ComponentDef_ptr base_component,
++ const IR_InterfaceDefSeq & supports_interfaces,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -4936,13 +4845,13 @@
+ TAO_default_environment ()
+ );
- virtual IR::HomeDef_ptr create_home (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_home_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_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 ()
-+ );
-
-- static void lookup_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ IR_HomeDef_ptr base_home,
++ IR_ComponentDef_ptr managed_component,
++ IR_ValueDef_ptr primary_key,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -4962,7 +4871,7 @@
+ 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 ()
-+ );
-
-- static void get_canonical_typecode_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -4970,7 +4879,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_ModuleDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void get_primitive_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -4978,7 +4887,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual const char* _interface_repository_id (void) const;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void create_string_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -4986,7 +4895,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void lookup_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_wstring_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -4994,7 +4903,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void contents_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_sequence_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5002,7 +4911,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void lookup_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_array_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5010,7 +4919,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void describe_contents_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_fixed_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5018,7 +4927,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_module_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void lookup_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5026,7 +4935,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_constant_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void contents_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5034,7 +4943,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_struct_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void lookup_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5042,7 +4951,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void describe_contents_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -5050,7 +4959,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_module_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -5058,7 +4967,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_constant_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -5066,7 +4975,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_union_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_struct_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5074,7 +4983,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_enum_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_union_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5082,7 +4991,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_alias_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_enum_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5090,7 +4999,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_interface_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_alias_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5098,7 +5007,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_value_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_interface_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5106,7 +5015,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_value_box_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_value_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5114,7 +5023,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_exception_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_value_box_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5122,7 +5031,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_native_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_exception_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5130,7 +5039,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_native_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5138,7 +5047,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5146,7 +5055,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5154,11 +5063,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-
--#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_ServerRequestInfo_IR_ComponentRepository_create_component : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::ComponentRepository;
-- TAO_ServerRequestInfo_IR_ComponentRepository_create_component (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentRepository *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -5175,8 +5083,8 @@
+ 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 ()
-- );
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- virtual Dynamic::ParameterList * arguments (
-- CORBA::Environment &ACE_TRY_ENV =
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
-- CORBA::Environment &ACE_TRY_ENV =
-+ );
-+
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-- CORBA::Environment &ACE_TRY_ENV =
-+ );
-+
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_ComponentRepository_create_component (const TAO_ServerRequestInfo_IR_ComponentRepository_create_component &);
-- void operator= (const TAO_ServerRequestInfo_IR_ComponentRepository_create_component &);
--
-- private:
-- POA_IR::ComponentRepository *_tao_impl;
-- 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 ()
+ );
+@@ -5218,11 +5126,11 @@
+ 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 base_component_;
++ const IR_InterfaceDefSeq & supports_interfaces_;
+ void result (IR::ComponentDef_ptr result);
+ // update the result
-IR::ComponentDef_ptr _result;
--};
-+ );
++ IR_ComponentDef_ptr _result;
+ };
--class TAO_ServerRequestInfo_IR_ComponentRepository_create_home : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ComponentRepository;
-- TAO_ServerRequestInfo_IR_ComponentRepository_create_home (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentRepository *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
+ class TAO_ServerRequestInfo_IR_ComponentRepository_create_home : public TAO_ServerRequestInfo
+@@ -5236,9 +5144,9 @@
+ 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 ()
-- );
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ComponentRepository_create_home (const TAO_ServerRequestInfo_IR_ComponentRepository_create_home &);
-- void operator= (const TAO_ServerRequestInfo_IR_ComponentRepository_create_home &);
--
--private:
-- POA_IR::ComponentRepository *_tao_impl;
-- 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 ()
+ );
+@@ -5280,32 +5188,31 @@
+ 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 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;
--};
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--#endif /* TAO_HAS_INTERCEPTORS */
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_HomeDef_ptr _result;
+ };
--};
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ #endif /* TAO_HAS_INTERCEPTORS */
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
+ };
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Declaration
//
--class _TAO_ComponentRepository_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ComponentRepository_Proxy_Broker
-+class _TAO_ModuleDef_Strategized_Proxy_Broker : public virtual _TAO_ModuleDef_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_ComponentRepository_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ComponentRepository_Proxy_Broker
++class _TAO_ComponentRepository_Strategized_Proxy_Broker : public virtual _TAO_ComponentRepository_Proxy_Broker
{
public:
-- _TAO_ComponentRepository_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_ComponentRepository_Strategized_Proxy_Broker (void);
--
+ _TAO_ComponentRepository_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_ComponentRepository_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_ComponentRepository_Proxy_Impl &select_proxy (
- ::IR::ComponentRepository *object,
-+ _TAO_ModuleDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_ModuleDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_ModuleDef_Proxy_Impl &select_proxy (
-+ IR_ModuleDef *object,
++ virtual _TAO_ComponentRepository_Proxy_Impl &select_proxy (
++ IR_ComponentRepository *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -5323,7 +3752,7 @@
+@@ -5323,7 +5230,7 @@
// 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.
- ::IR::_TAO_ComponentRepository_Proxy_Impl
-+ _TAO_ModuleDef_Proxy_Impl
++ _TAO_ComponentRepository_Proxy_Impl
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -5332,10 +3761,9 @@
- // interface.
-
- public:
-- static _TAO_ComponentRepository_Strategized_Proxy_Broker *the_TAO_ComponentRepository_Strategized_Proxy_Broker (void);
-+ static _TAO_ModuleDef_Strategized_Proxy_Broker *the_TAO_ModuleDef_Strategized_Proxy_Broker (void);
+@@ -5335,7 +5242,6 @@
+ static _TAO_ComponentRepository_Strategized_Proxy_Broker *the_TAO_ComponentRepository_Strategized_Proxy_Broker (void);
};
-
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-@@ -5345,44 +3773,18 @@
+@@ -5345,8 +5251,8 @@
// ThruPOA Impl. Declaration
//
--class _TAO_ComponentRepository_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_ComponentRepository_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_ComponentRepository_Proxy_Impl,
-+class _TAO_ModuleDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_ModuleDef_Proxy_Impl,
++class _TAO_ComponentRepository_ThruPOA_Proxy_Impl :
++ public virtual _TAO_ComponentRepository_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl
-+ public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
+ public virtual ::POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl
- {
- public:
-- _TAO_ComponentRepository_ThruPOA_Proxy_Impl (void);
-+ _TAO_ModuleDef_ThruPOA_Proxy_Impl (void);
+@@ -5356,33 +5262,32 @@
-- virtual ~_TAO_ComponentRepository_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_ModuleDef_ThruPOA_Proxy_Impl (void);
+ virtual ~_TAO_ComponentRepository_ThruPOA_Proxy_Impl (void) { }
- virtual IR::ComponentDef_ptr create_component (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
--
++ 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 (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
++ 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
+ ));
-
};
-@@ -5390,658 +3792,601 @@
+@@ -5390,11 +5295,12 @@
// ThruPOA Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-
#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class ComponentRepository_tie : public ComponentRepository
--{
--public:
-- ComponentRepository_tie (T &t);
-- // the T& ctor
-- ComponentRepository_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- ComponentRepository_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- ComponentRepository_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~ComponentRepository_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export ComponentRepository_tie : public ComponentRepository
++ class ComponentRepository_tie
++ : public virtual ComponentRepository,
++ public virtual PortableServer::RefCountServantBase
+ {
+ public:
+ ComponentRepository_tie (T &t);
+@@ -5422,15 +5328,15 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
- IR::ComponentDef_ptr create_component (
-- const char * id,
-- const char * name,
-- const char * version,
++ IR_ComponentDef_ptr create_component (
+ 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 ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_ComponentDef_ptr base_component,
++ const IR_InterfaceDefSeq & supports_interfaces,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -5438,13 +5344,13 @@
+ CORBA::SystemException
+ ));
+
- IR::HomeDef_ptr create_home (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class ModuleDef_tie : public ModuleDef
-+ {
-+ public:
-+ ModuleDef_tie (T &t);
-+ // the T& ctor
-+ ModuleDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ ModuleDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ ModuleDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~ModuleDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ IR_Contained_ptr lookup (
-+ const char * search_name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_HomeDef_ptr base_home,
++ IR_ComponentDef_ptr managed_component,
++ IR_ValueDef_ptr primary_key,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -5452,7 +5358,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained_ptr lookup_id (
-- const char * search_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_ContainedSeq * contents (
-+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- CORBA::TypeCode_ptr get_canonical_typecode (
-- CORBA::TypeCode_ptr tc,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_ContainedSeq * lookup_name (
-+ const char * search_name,
-+ CORBA::Long levels_to_search,
-+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Contained_ptr lookup_id (
+ const char * search_id,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -5470,8 +5376,8 @@
+ CORBA::SystemException
+ ));
- IR::PrimitiveDef_ptr get_primitive (
- IR::PrimitiveKind kind,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
++ IR_PrimitiveDef_ptr get_primitive (
++ IR_PrimitiveKind kind,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -5479,7 +5385,7 @@
+ CORBA::SystemException
+ ));
- IR::StringDef_ptr create_string (
-- CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
++ IR_StringDef_ptr create_string (
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -5488,7 +5394,7 @@
+ CORBA::SystemException
+ ));
- IR::WstringDef_ptr create_wstring (
-- CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
++ IR_WstringDef_ptr create_wstring (
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -5497,9 +5403,9 @@
+ CORBA::SystemException
+ ));
- IR::SequenceDef_ptr create_sequence (
-- CORBA::ULong bound,
++ IR_SequenceDef_ptr create_sequence (
+ CORBA::ULong bound,
- IR::IDLType_ptr element_type,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -5507,9 +5413,9 @@
+ CORBA::SystemException
+ ));
- IR::ArrayDef_ptr create_array (
-- CORBA::ULong length,
++ IR_ArrayDef_ptr create_array (
+ CORBA::ULong length,
- IR::IDLType_ptr element_type,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -5517,7 +5423,7 @@
+ CORBA::SystemException
+ ));
- IR::FixedDef_ptr create_fixed (
-- CORBA::UShort digits,
-- CORBA::Short scale,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
++ IR_FixedDef_ptr create_fixed (
+ CORBA::UShort digits,
+ CORBA::Short scale,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -5527,7 +5433,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained_ptr lookup (
-- const char * search_name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
++ IR_Contained_ptr lookup (
+ const char * search_name,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -5536,8 +5442,8 @@
+ CORBA::SystemException
+ ));
- IR::ContainedSeq * contents (
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
++ IR_ContainedSeq * contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -5546,10 +5452,10 @@
+ CORBA::SystemException
+ ));
- IR::ContainedSeq * lookup_name (
-- const char * search_name,
-- CORBA::Long levels_to_search,
++ IR_ContainedSeq * lookup_name (
+ const char * search_name,
+ CORBA::Long levels_to_search,
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -5558,8 +5464,8 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
-+ 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
-+ ));
++ IR_Container::DescriptionSeq * describe_contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Long max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -5569,7 +5475,7 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
-+ 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
-+ ));
++ IR_ModuleDef_ptr create_module (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -5580,11 +5486,11 @@
+ CORBA::SystemException
+ ));
- IR::ConstantDef_ptr create_constant (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ 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
-+ ));
++ IR_IDLType_ptr type,
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -5593,11 +5499,11 @@
+ CORBA::SystemException
+ ));
- IR::StructDef_ptr create_struct (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -5605,12 +5511,12 @@
+ CORBA::SystemException
+ ));
- IR::UnionDef_ptr create_union (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr discriminator_type,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -5618,11 +5524,11 @@
+ CORBA::SystemException
+ ));
- IR::EnumDef_ptr create_enum (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -5630,11 +5536,11 @@
+ CORBA::SystemException
+ ));
- IR::AliasDef_ptr create_alias (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr original_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -5642,11 +5548,11 @@
+ CORBA::SystemException
+ ));
- IR::InterfaceDef_ptr create_interface (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -5656,17 +5562,17 @@
+ CORBA::SystemException
+ ));
- 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 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,
++ 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
-- ));
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_ValueDefSeq & abstract_base_values,
++ const IR_InterfaceDefSeq & supported_interfaces,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -5674,11 +5580,11 @@
+ CORBA::SystemException
+ ));
- IR::ValueBoxDef_ptr create_value_box (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -5686,11 +5592,11 @@
+ CORBA::SystemException
+ ));
- IR::ExceptionDef_ptr create_exception (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -5698,7 +5604,7 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_NativeDef_ptr create_native (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -5709,7 +5615,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- ComponentRepository_tie (const ComponentRepository_tie &);
-- void operator= (const ComponentRepository_tie &);
--};
+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--#endif /* ACE_HAS_USING_KEYWORD */
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class ModuleDef;
--typedef ModuleDef *ModuleDef_ptr;
--// Forward Classes Declaration
--class _TAO_ModuleDef_ThruPOA_Proxy_Impl;
--class _TAO_ModuleDef_Strategized_Proxy_Broker;
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-
--class ModuleDef : public virtual Container, public virtual Contained
--{
--protected:
-- ModuleDef (void);
-+ // copy and assignment are not allowed
-+ ModuleDef_tie (const ModuleDef_tie &);
-+ void operator= (const ModuleDef_tie &);
-+ };
-
--public:
-- ModuleDef (const ModuleDef& rhs);
-- virtual ~ModuleDef (void);
-+#endif /* ACE_HAS_USING_KEYWORD */
-
-+ class ConstantDef;
-+ typedef ConstantDef *ConstantDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
-+ class _TAO_ConstantDef_Strategized_Proxy_Broker;
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class ConstantDef : public virtual Contained
-+ {
-+ protected:
-+ ConstantDef (void);
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+ public:
-+ ConstantDef (const ConstantDef& rhs);
-+ virtual ~ConstantDef (void);
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -5743,7 +5649,8 @@
+ class _TAO_ModuleDef_ThruPOA_Proxy_Impl;
+ class _TAO_ModuleDef_Strategized_Proxy_Broker;
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ 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 ()
-- );
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
+-class TAO_IFR_Client_Export ModuleDef : public virtual Container, public virtual Contained
++ class ModuleDef : public virtual Container,
++ public virtual Contained
+ {
+ protected:
+ ModuleDef (void);
+@@ -5786,7 +5693,7 @@
+ TAO_default_environment ()
+ );
- ::IR::ModuleDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual const char* _interface_repository_id (void) const;
-+ static void _non_existent_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void lookup_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ IR_ModuleDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -5797,7 +5704,7 @@
+ 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 ()
-+ );
-
-- static void contents_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -5805,7 +5712,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_ConstantDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void lookup_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5813,7 +5720,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual const char* _interface_repository_id (void) const;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void describe_contents_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5821,7 +5728,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void create_module_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -5829,7 +5736,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_type_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_constant_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -5837,7 +5744,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_struct_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -5845,7 +5752,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_union_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -5853,7 +5760,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_enum_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -5861,7 +5768,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_alias_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -5869,7 +5776,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_interface_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -5877,7 +5784,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_IDLType_ptr type_def (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void create_value_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -5885,7 +5792,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_type_def_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_value_box_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -5893,7 +5800,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void type_def (
-+ IR_IDLType_ptr type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void create_exception_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -5901,7 +5808,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_type_def_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_native_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -5909,7 +5816,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Any * value (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -5917,7 +5824,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_value_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -5925,7 +5832,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void value (
-+ const CORBA::Any & value,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -5933,7 +5840,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_value_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -5941,7 +5848,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5949,7 +5856,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -5957,7 +5864,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5965,7 +5872,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5973,7 +5880,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5981,7 +5888,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5989,7 +5896,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -5997,7 +5904,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -6005,7 +5912,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -6013,11 +5920,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-
--#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 */
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--};
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -6027,20 +5933,19 @@
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
+ };
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Declaration
//
--class _TAO_ModuleDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ModuleDef_Proxy_Broker
-+class _TAO_ConstantDef_Strategized_Proxy_Broker : public virtual _TAO_ConstantDef_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_ModuleDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ModuleDef_Proxy_Broker
++class _TAO_ModuleDef_Strategized_Proxy_Broker : public virtual _TAO_ModuleDef_Proxy_Broker
{
public:
-- _TAO_ModuleDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_ModuleDef_Strategized_Proxy_Broker (void);
--
+ _TAO_ModuleDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_ModuleDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_ModuleDef_Proxy_Impl &select_proxy (
- ::IR::ModuleDef *object,
-- CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-+ _TAO_ConstantDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_ConstantDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_ConstantDef_Proxy_Impl &select_proxy (
-+ IR_ConstantDef *object,
-+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
++ virtual _TAO_ModuleDef_Proxy_Impl &select_proxy (
++ IR_ModuleDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
- private:
-@@ -6058,7 +4403,7 @@
+@@ -6058,7 +5963,7 @@
// 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.
- ::IR::_TAO_ModuleDef_Proxy_Impl
-+ _TAO_ConstantDef_Proxy_Impl
++ _TAO_ModuleDef_Proxy_Impl
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -6067,10 +4412,9 @@
- // interface.
-
- public:
-- static _TAO_ModuleDef_Strategized_Proxy_Broker *the_TAO_ModuleDef_Strategized_Proxy_Broker (void);
-+ static _TAO_ConstantDef_Strategized_Proxy_Broker *the_TAO_ConstantDef_Strategized_Proxy_Broker (void);
+@@ -6070,7 +5975,6 @@
+ static _TAO_ModuleDef_Strategized_Proxy_Broker *the_TAO_ModuleDef_Strategized_Proxy_Broker (void);
};
-
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-@@ -6080,883 +4424,446 @@
+@@ -6080,8 +5984,8 @@
// ThruPOA Impl. Declaration
//
--class _TAO_ModuleDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_ModuleDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_ModuleDef_Proxy_Impl,
-+class _TAO_ConstantDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_ConstantDef_Proxy_Impl,
++class _TAO_ModuleDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_ModuleDef_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl,
+ public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl,
public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-
+@@ -6099,11 +6003,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export ModuleDef_tie : public ModuleDef
++ class ModuleDef_tie : public ModuleDef
{
public:
-- _TAO_ModuleDef_ThruPOA_Proxy_Impl (void);
-+ _TAO_ConstantDef_ThruPOA_Proxy_Impl (void);
+ ModuleDef_tie (T &t);
+@@ -6131,10 +6034,10 @@
-- virtual ~_TAO_ModuleDef_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_ConstantDef_ThruPOA_Proxy_Impl (void);
-
-- };
--
--
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
--
--
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class ModuleDef_tie : public ModuleDef
--{
--public:
-- ModuleDef_tie (T &t);
-- // the T& ctor
-- ModuleDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- ModuleDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- ModuleDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~ModuleDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
- IR::Contained_ptr lookup (
-- const char * search_name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_Contained_ptr lookup (
+ const char * search_name,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -6143,8 +6046,8 @@
+ CORBA::SystemException
+ ));
+
- IR::ContainedSeq * contents (
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual CORBA::TypeCode_ptr type (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
++ IR_ContainedSeq * contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -6153,10 +6056,10 @@
CORBA::SystemException
));
- IR::ContainedSeq * lookup_name (
-- const char * search_name,
-- CORBA::Long levels_to_search,
++ IR_ContainedSeq * lookup_name (
+ const char * search_name,
+ CORBA::Long levels_to_search,
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual IR_IDLType_ptr type_def (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -6165,8 +6068,8 @@
CORBA::SystemException
));
- 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 ()
-+ virtual void type_def (
-+ CORBA_Object *_collocated_tao_target_,
-+ IR_IDLType_ptr type_def,
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
++ IR_Container::DescriptionSeq * describe_contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Long max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -6176,7 +6079,7 @@
CORBA::SystemException
));
- IR::ModuleDef_ptr create_module (
-- const char * id,
-- const char * name,
-- const char * version,
-- 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 ((
++ IR_ModuleDef_ptr create_module (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -6187,11 +6090,11 @@
CORBA::SystemException
));
- IR::ConstantDef_ptr create_constant (
-- const char * id,
-- const char * name,
-- const char * version,
++ IR_ConstantDef_ptr create_constant (
+ const char * id,
+ const char * name,
+ const char * version,
- IR::IDLType_ptr type,
-+ virtual void value (
-+ CORBA_Object *_collocated_tao_target_,
++ IR_IDLType_ptr type,
const CORBA::Any & value,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -6200,11 +6103,11 @@
+ CORBA::SystemException
+ ));
+
- IR::StructDef_ptr create_struct (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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 ()
-+ CORBA::Environment &ACE_TRY_ENV
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -6212,12 +6115,12 @@
CORBA::SystemException
));
- IR::UnionDef_ptr create_union (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+};
++ IR_IDLType_ptr discriminator_type,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -6225,11 +6128,11 @@
+ CORBA::SystemException
+ ));
- IR::EnumDef_ptr create_enum (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -6237,11 +6140,11 @@
+ CORBA::SystemException
+ ));
- IR::AliasDef_ptr create_alias (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
++ IR_IDLType_ptr original_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -6249,11 +6152,11 @@
+ CORBA::SystemException
+ ));
- IR::InterfaceDef_ptr create_interface (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class ConstantDef_tie : public ConstantDef
-+ {
-+ public:
-+ ConstantDef_tie (T &t);
-+ // the T& ctor
-+ ConstantDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ ConstantDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ ConstantDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~ConstantDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -6263,17 +6166,17 @@
+ CORBA::SystemException
+ ));
- 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 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,
++ 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
-- ));
-+ IR_IDLType_ptr type_def (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_ValueDefSeq & abstract_base_values,
++ const IR_InterfaceDefSeq & supported_interfaces,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -6281,11 +6184,11 @@
+ CORBA::SystemException
+ ));
- IR::ValueBoxDef_ptr create_value_box (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ void type_def (
-+ IR_IDLType_ptr type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -6293,11 +6196,11 @@
+ CORBA::SystemException
+ ));
- IR::ExceptionDef_ptr create_exception (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ CORBA::Any * value (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -6305,7 +6208,7 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
-+ void value (
-+ const CORBA::Any & value,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_NativeDef_ptr create_native (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -6367,7 +6270,7 @@
+ CORBA::SystemException
+ ));
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -6383,7 +6286,7 @@
+ CORBA::SystemException
+ ));
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -6391,7 +6294,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void move (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -6400,7 +6303,7 @@
+ ));
+
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void move (
+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -6410,7 +6313,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
- private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- ModuleDef_tie (const ModuleDef_tie &);
-- void operator= (const ModuleDef_tie &);
--};
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-+
-+ // copy and assignment are not allowed
-+ ConstantDef_tie (const ConstantDef_tie &);
-+ void operator= (const ConstantDef_tie &);
-+ };
-
- #endif /* ACE_HAS_USING_KEYWORD */
-
--class ConstantDef;
--typedef ConstantDef *ConstantDef_ptr;
--// Forward Classes Declaration
--class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
--class _TAO_ConstantDef_Strategized_Proxy_Broker;
-+ class TypedefDef;
-+ typedef TypedefDef *TypedefDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_TypedefDef_ThruPOA_Proxy_Impl;
-+ class _TAO_TypedefDef_Strategized_Proxy_Broker;
-
--class ConstantDef : public virtual Contained
--{
--protected:
-- ConstantDef (void);
-+ class TypedefDef : public virtual Contained, public virtual IDLType
-+ {
-+ protected:
-+ TypedefDef (void);
-
--public:
-- ConstantDef (const ConstantDef& rhs);
-- virtual ~ConstantDef (void);
-+ public:
-+ TypedefDef (const TypedefDef& rhs);
-+ virtual ~TypedefDef (void);
-
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -6444,7 +6347,7 @@
+ class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
+ class _TAO_ConstantDef_Strategized_Proxy_Broker;
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+ virtual void* _downcast (
-+ 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 ()
-- );
-+ static void _is_a_skel (
-+ 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 ()
-- );
-+ static void _non_existent_skel (
-+ 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 ()
-- );
-+ virtual void _dispatch (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+-class TAO_IFR_Client_Export ConstantDef : public virtual Contained
++ class ConstantDef : public virtual Contained
+ {
+ protected:
+ ConstantDef (void);
+@@ -6487,7 +6390,7 @@
+ TAO_default_environment ()
+ );
- ::IR::ConstantDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_TypedefDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ IR_ConstantDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -6510,7 +6413,7 @@
+ TAO_default_environment ()
+ );
-- virtual const char* _interface_repository_id (void) const;
-+ virtual const char* _interface_repository_id (void) const;
+- virtual IR::IDLType_ptr type_def (
++ virtual IR_IDLType_ptr type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -6527,7 +6430,7 @@
+ );
-- virtual CORBA::TypeCode_ptr type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_type_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ virtual void type_def (
+- IR::IDLType_ptr type_def,
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -6580,7 +6483,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- virtual IR::IDLType_ptr type_def (
+@@ -6588,7 +6491,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_type_def_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- virtual void type_def (
-- IR::IDLType_ptr type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_type_def_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -6596,7 +6499,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- virtual CORBA::Any * value (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_value_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
+@@ -6604,7 +6507,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- virtual void value (
-- const CORBA::Any & value,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_value_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -6612,7 +6515,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -6620,7 +6523,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_type_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -6628,7 +6531,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -6636,7 +6539,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -6644,7 +6547,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -6652,7 +6555,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
--
--#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_ServerRequestInfo_IR_ConstantDef_type_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::ConstantDef;
-- TAO_ServerRequestInfo_IR_ConstantDef_type_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ConstantDef *tao_impl
-- ,
-- 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 =
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_ConstantDef_type_get (const TAO_ServerRequestInfo_IR_ConstantDef_type_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ConstantDef_type_get &);
--
-- private:
-- POA_IR::ConstantDef *_tao_impl;
-- void result (CORBA::TypeCode_ptr result);
-- // update the result
--CORBA::TypeCode_ptr _result;
--};
--
--class TAO_ServerRequestInfo_IR_ConstantDef_type_def_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ConstantDef;
-- TAO_ServerRequestInfo_IR_ConstantDef_type_def_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ConstantDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual Dynamic::ParameterList * arguments (
+ TAO_default_environment ()
+ );
+
+@@ -6660,7 +6563,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -6668,7 +6571,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -6676,11 +6579,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ConstantDef_type_def_get (const TAO_ServerRequestInfo_IR_ConstantDef_type_def_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ConstantDef_type_def_get &);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
-
--private:
-- POA_IR::ConstantDef *_tao_impl;
-- void result (IR::IDLType_ptr result);
-- // update the result
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -6785,7 +6687,7 @@
+ POA_IR::ConstantDef *_tao_impl;
+ void result (IR::IDLType_ptr result);
+ // update the result
-IR::IDLType_ptr _result;
--};
--
--class TAO_ServerRequestInfo_IR_ConstantDef_type_def_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ConstantDef;
-- TAO_ServerRequestInfo_IR_ConstantDef_type_def_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ConstantDef *tao_impl
-- ,
++ IR_IDLType_ptr _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_ConstantDef_type_def_set : public TAO_ServerRequestInfo
+@@ -6796,7 +6698,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::ConstantDef *tao_impl
+ ,
- 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));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ConstantDef_type_def_set (const TAO_ServerRequestInfo_IR_ConstantDef_type_def_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_ConstantDef_type_def_set &);
--
--private:
-- POA_IR::ConstantDef *_tao_impl;
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -6835,7 +6737,7 @@
+
+ private:
+ POA_IR::ConstantDef *_tao_impl;
- IR::IDLType_ptr type_def_;
--};
--
--class TAO_ServerRequestInfo_IR_ConstantDef_value_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ConstantDef;
-- TAO_ServerRequestInfo_IR_ConstantDef_value_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ConstantDef *tao_impl
-- ,
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ConstantDef_value_get (const TAO_ServerRequestInfo_IR_ConstantDef_value_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ConstantDef_value_get &);
--
--private:
-- POA_IR::ConstantDef *_tao_impl;
-- void result (CORBA::Any * result);
-- // update the result
--CORBA::Any * _result;
--};
--
--class TAO_ServerRequestInfo_IR_ConstantDef_value_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ConstantDef;
-- TAO_ServerRequestInfo_IR_ConstantDef_value_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ConstantDef *tao_impl
-- ,
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ConstantDef_value_set (const TAO_ServerRequestInfo_IR_ConstantDef_value_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_ConstantDef_value_set &);
--
--private:
-- POA_IR::ConstantDef *_tao_impl;
-- const CORBA::Any & value_;
--};
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--};
--
-+ );
-+ };
++ IR_IDLType_ptr type_def_;
+ };
+
+ class TAO_ServerRequestInfo_IR_ConstantDef_value_get : public TAO_ServerRequestInfo
+@@ -6943,20 +6845,19 @@
+
+ };
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Declaration
//
--class _TAO_ConstantDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ConstantDef_Proxy_Broker
-+class _TAO_TypedefDef_Strategized_Proxy_Broker : public virtual _TAO_TypedefDef_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_ConstantDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ConstantDef_Proxy_Broker
++class _TAO_ConstantDef_Strategized_Proxy_Broker : public virtual _TAO_ConstantDef_Proxy_Broker
{
public:
-- _TAO_ConstantDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_ConstantDef_Strategized_Proxy_Broker (void);
--
+ _TAO_ConstantDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_ConstantDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_ConstantDef_Proxy_Impl &select_proxy (
- ::IR::ConstantDef *object,
-+ _TAO_TypedefDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_TypedefDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_TypedefDef_Proxy_Impl &select_proxy (
-+ IR_TypedefDef *object,
++ virtual _TAO_ConstantDef_Proxy_Impl &select_proxy (
++ IR_ConstantDef *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -6974,7 +4881,7 @@
+@@ -6974,7 +6875,7 @@
// 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.
- ::IR::_TAO_ConstantDef_Proxy_Impl
-+ _TAO_TypedefDef_Proxy_Impl
++ _TAO_ConstantDef_Proxy_Impl
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -6983,10 +4890,9 @@
- // interface.
-
- public:
-- static _TAO_ConstantDef_Strategized_Proxy_Broker *the_TAO_ConstantDef_Strategized_Proxy_Broker (void);
-+ static _TAO_TypedefDef_Strategized_Proxy_Broker *the_TAO_TypedefDef_Strategized_Proxy_Broker (void);
+@@ -6986,7 +6887,6 @@
+ static _TAO_ConstantDef_Strategized_Proxy_Broker *the_TAO_ConstantDef_Strategized_Proxy_Broker (void);
};
-
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-@@ -6996,59 +4902,18 @@
+@@ -6996,8 +6896,8 @@
// ThruPOA Impl. Declaration
//
--class _TAO_ConstantDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_ConstantDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_ConstantDef_Proxy_Impl,
-+class _TAO_TypedefDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_TypedefDef_Proxy_Impl,
++class _TAO_ConstantDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_ConstantDef_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
-
- {
- public:
-- _TAO_ConstantDef_ThruPOA_Proxy_Impl (void);
-+ _TAO_TypedefDef_ThruPOA_Proxy_Impl (void);
-
-- virtual ~_TAO_ConstantDef_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_TypedefDef_ThruPOA_Proxy_Impl (void);
+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-- 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_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
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- virtual CORBA::Any * value (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- virtual void value (
-- CORBA_Object *_collocated_tao_target_,
-- const CORBA::Any & value,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
- };
+@@ -7015,7 +6915,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
+ )
+@@ -7025,7 +6925,7 @@
-@@ -7056,2239 +4921,2088 @@
+ 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 ((
+@@ -7056,11 +6956,10 @@
// ThruPOA Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-
#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class ConstantDef_tie : public ConstantDef
--{
--public:
-- ConstantDef_tie (T &t);
-- // the T& ctor
-- ConstantDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- ConstantDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- ConstantDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~ConstantDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- CORBA::TypeCode_ptr type (
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export ConstantDef_tie : public ConstantDef
++ class ConstantDef_tie : public ConstantDef
+ {
+ public:
+ ConstantDef_tie (T &t);
+@@ -7088,7 +6987,7 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+ CORBA::TypeCode_ptr type (
+@@ -7099,7 +6998,7 @@
+ CORBA::SystemException
+ ));
+
- IR::IDLType_ptr type_def (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void type_def (
++ IR_IDLType_ptr type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -7108,7 +7007,7 @@
+ ));
+
+ void type_def (
- IR::IDLType_ptr type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- CORBA::Any * value (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void value (
-- const CORBA::Any & value,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class TypedefDef_tie : public TypedefDef
-+ {
-+ public:
-+ TypedefDef_tie (T &t);
-+ // the T& ctor
-+ TypedefDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ TypedefDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ TypedefDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~TypedefDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -7184,7 +7083,7 @@
+ CORBA::SystemException
+ ));
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -7200,7 +7099,7 @@
+ CORBA::SystemException
+ ));
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -7208,7 +7107,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void move (
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -7217,7 +7116,7 @@
+ ));
+
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -7227,7 +7126,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
- private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- ConstantDef_tie (const ConstantDef_tie &);
-- void operator= (const ConstantDef_tie &);
--};
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-+
-+ // copy and assignment are not allowed
-+ TypedefDef_tie (const TypedefDef_tie &);
-+ void operator= (const TypedefDef_tie &);
-+ };
-
- #endif /* ACE_HAS_USING_KEYWORD */
-
--class TypedefDef;
--typedef TypedefDef *TypedefDef_ptr;
--// Forward Classes Declaration
--class _TAO_TypedefDef_ThruPOA_Proxy_Impl;
--class _TAO_TypedefDef_Strategized_Proxy_Broker;
-+ class StructDef;
-+ typedef StructDef *StructDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_StructDef_ThruPOA_Proxy_Impl;
-+ class _TAO_StructDef_Strategized_Proxy_Broker;
-
--class TypedefDef : public virtual Contained, public virtual IDLType
--{
--protected:
-- TypedefDef (void);
-+ class StructDef : public virtual TypedefDef, public virtual Container
-+ {
-+ protected:
-+ StructDef (void);
-
--public:
-- TypedefDef (const TypedefDef& rhs);
-- virtual ~TypedefDef (void);
-+ public:
-+ StructDef (const StructDef& rhs);
-+ virtual ~StructDef (void);
-
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -7261,7 +7160,7 @@
+ class _TAO_TypedefDef_ThruPOA_Proxy_Impl;
+ class _TAO_TypedefDef_Strategized_Proxy_Broker;
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+ virtual void* _downcast (
-+ 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 ()
-- );
-+ static void _is_a_skel (
-+ 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 ()
-- );
-+ static void _non_existent_skel (
-+ 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 ()
-- );
-+ virtual void _dispatch (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+-class TAO_IFR_Client_Export TypedefDef : public virtual Contained, public virtual IDLType
++ class TypedefDef : public virtual Contained, public virtual IDLType
+ {
+ protected:
+ TypedefDef (void);
+@@ -7304,7 +7203,7 @@
+ TAO_default_environment ()
+ );
- ::IR::TypedefDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_StructDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual const char* _interface_repository_id (void) const;
-+ virtual const char* _interface_repository_id (void) const;
-
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ IR_TypedefDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -7315,7 +7214,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_StructMemberSeq * members (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7323,7 +7222,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_members_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7331,7 +7230,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void members (
-+ const IR_StructMemberSeq & members,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7339,7 +7238,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_members_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7347,7 +7246,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void lookup_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7355,7 +7254,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void contents_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -7363,7 +7262,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void lookup_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -7371,7 +7270,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void describe_contents_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -7379,7 +7278,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_module_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -7387,7 +7286,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_constant_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -7395,7 +7294,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_struct_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_type_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -7403,7 +7302,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_union_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -7411,7 +7310,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_enum_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -7419,11 +7318,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_alias_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-
--#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 */
-+ static void create_interface_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -7433,20 +7331,19 @@
--};
-+ static void create_value_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void create_value_box_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Declaration
--//
-+ static void create_exception_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--class _TAO_TypedefDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_TypedefDef_Proxy_Broker
--{
--public:
-- _TAO_TypedefDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_TypedefDef_Strategized_Proxy_Broker (void);
--
+ };
+
+-
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Declaration
+ //
+
+-class TAO_IFR_Client_Export _TAO_TypedefDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_TypedefDef_Proxy_Broker
++class _TAO_TypedefDef_Strategized_Proxy_Broker : public virtual _TAO_TypedefDef_Proxy_Broker
+ {
+ public:
+ _TAO_TypedefDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_TypedefDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_TypedefDef_Proxy_Impl &select_proxy (
- ::IR::TypedefDef *object,
-- CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-- );
-+ static void create_native_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--private:
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--// 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
-- );
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ virtual _TAO_TypedefDef_Proxy_Impl &select_proxy (
++ IR_TypedefDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
--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.
+@@ -7464,7 +7361,7 @@
+ // 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.
- ::IR::_TAO_TypedefDef_Proxy_Impl
-- *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
--
-- TAO_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.
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ _TAO_TypedefDef_Proxy_Impl
+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
+
+ TAO_SYNCH_MUTEX mutex_;
+@@ -7476,7 +7373,6 @@
+ static _TAO_TypedefDef_Strategized_Proxy_Broker *the_TAO_TypedefDef_Strategized_Proxy_Broker (void);
+ };
--public:
-- static _TAO_TypedefDef_Strategized_Proxy_Broker *the_TAO_TypedefDef_Strategized_Proxy_Broker (void);
--};
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--//
--// End Strategized Proxy Broker Declaration
--///////////////////////////////////////////////////////////////////////
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Impl. Declaration
--//
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--class _TAO_TypedefDef_ThruPOA_Proxy_Impl :
-- public virtual ::IR::_TAO_TypedefDef_Proxy_Impl,
-- public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
--
--{
--public:
-- _TAO_TypedefDef_ThruPOA_Proxy_Impl (void);
--
-- virtual ~_TAO_TypedefDef_ThruPOA_Proxy_Impl (void) { }
--
-- };
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void _get_type_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+-
+ //
+ // End Strategized Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -7486,8 +7382,8 @@
+ // ThruPOA Impl. Declaration
+ //
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class TypedefDef_tie : public TypedefDef
--{
--public:
-- TypedefDef_tie (T &t);
-- // the T& ctor
-- TypedefDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- TypedefDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- TypedefDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~TypedefDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+-class TAO_IFR_Client_Export _TAO_TypedefDef_ThruPOA_Proxy_Impl :
+- public virtual ::IR::_TAO_TypedefDef_Proxy_Impl,
++class _TAO_TypedefDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_TypedefDef_Proxy_Impl,
+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl,
+ public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
+@@ -7505,11 +7401,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
-- void id (
-- const char * id,
+-
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export TypedefDef_tie : public TypedefDef
++ class TypedefDef_tie : public TypedefDef
+ {
+ public:
+ TypedefDef_tie (T &t);
+@@ -7537,7 +7432,7 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
-
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Declaration
-+//
-
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+class _TAO_StructDef_Strategized_Proxy_Broker : public virtual _TAO_StructDef_Proxy_Broker
-+{
-+public:
-+ _TAO_StructDef_Strategized_Proxy_Broker (void);
-
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual ~_TAO_StructDef_Strategized_Proxy_Broker (void);
-
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual _TAO_StructDef_Proxy_Impl &select_proxy (
-+ IR_StructDef *object,
-+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
+ char * id (
+@@ -7591,7 +7486,7 @@
+ CORBA::SystemException
+ ));
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+private:
-
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+// 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
-+ );
-
-- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+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_StructDef_Proxy_Impl
-+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-+
-+ TAO_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.
-
-- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+public:
-+ static _TAO_StructDef_Strategized_Proxy_Broker *the_TAO_StructDef_Strategized_Proxy_Broker (void);
-+};
-
-- void move (
-- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+//
-+// End Strategized Proxy Broker Declaration
-+///////////////////////////////////////////////////////////////////////
-
-- CORBA::TypeCode_ptr type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-
-- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Impl. Declaration
-+//
-+
-+class _TAO_StructDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_StructDef_Proxy_Impl,
-+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl
-+
-+{
-+public:
-+ _TAO_StructDef_ThruPOA_Proxy_Impl (void);
-+
-+ virtual ~_TAO_StructDef_ThruPOA_Proxy_Impl (void);
-+
-+ virtual IR_StructMemberSeq * members (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -7607,7 +7502,7 @@
CORBA::SystemException
));
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual void members (
-+ CORBA_Object *_collocated_tao_target_,
-+ const IR_StructMemberSeq & members,
-+ CORBA::Environment &ACE_TRY_ENV
+- IR::Repository_ptr containing_repository (
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -7615,7 +7510,7 @@
CORBA::SystemException
));
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- TypedefDef_tie (const TypedefDef_tie &);
-- void operator= (const TypedefDef_tie &);
- };
-
--#endif /* ACE_HAS_USING_KEYWORD */
-
--class StructDef;
--typedef StructDef *StructDef_ptr;
--// Forward Classes Declaration
--class _TAO_StructDef_ThruPOA_Proxy_Impl;
--class _TAO_StructDef_Strategized_Proxy_Broker;
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
+- IR::Contained::Description * describe (
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -7624,7 +7519,7 @@
+ ));
--class StructDef : public virtual TypedefDef, public virtual Container
--{
--protected:
-- StructDef (void);
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class StructDef_tie : public StructDef
-+ {
-+ public:
-+ StructDef_tie (T &t);
-+ // the T& ctor
-+ StructDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ StructDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ StructDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~StructDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ IR_StructMemberSeq * members (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ 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 =
+@@ -7642,7 +7537,7 @@
+ CORBA::SystemException
+ ));
--public:
-- StructDef (const StructDef& rhs);
-- virtual ~StructDef (void);
-+ void members (
-+ const IR_StructMemberSeq & members,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+- IR::DefinitionKind def_kind (
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -7676,7 +7571,7 @@
+ class _TAO_StructDef_ThruPOA_Proxy_Impl;
+ class _TAO_StructDef_Strategized_Proxy_Broker;
-+ IR_Contained_ptr lookup (
-+ const char * search_name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_ContainedSeq * contents (
-+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+ IR_ContainedSeq * lookup_name (
-+ const char * search_name,
-+ CORBA::Long levels_to_search,
-+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
-
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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 void _dispatch (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
+-class TAO_IFR_Client_Export StructDef : public virtual TypedefDef, public virtual Container
++ class StructDef : public virtual TypedefDef, public virtual Container
+ {
+ protected:
+ StructDef (void);
+@@ -7719,14 +7614,14 @@
+ TAO_default_environment ()
+ );
- ::IR::StructDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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 const char* _interface_repository_id (void) const;
-+ 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
-+ ));
++ IR_StructDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+
+ virtual const char* _interface_repository_id (void) const;
- virtual IR::StructMemberSeq * members (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ 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
-+ ));
-
-- static void _get_members_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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 void members (
++ virtual IR_StructMemberSeq * members (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -7743,7 +7638,7 @@
+ );
+
+ virtual void members (
- const IR::StructMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ 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
-+ ));
-
-- static void _set_members_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
-
-- static void lookup_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -7763,7 +7658,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
-
-- static void contents_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7771,7 +7666,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
-
-- static void lookup_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7779,7 +7674,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
-
-- static void describe_contents_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7787,7 +7682,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_module_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7795,7 +7690,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_constant_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7803,7 +7698,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_struct_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7811,7 +7706,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_union_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7819,7 +7714,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_enum_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7827,7 +7722,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_alias_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7835,7 +7730,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_interface_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7843,7 +7738,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_value_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7851,7 +7746,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_value_box_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7859,7 +7754,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_exception_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7867,7 +7762,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_native_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7875,7 +7770,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7883,7 +7778,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7891,7 +7786,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7899,7 +7794,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7907,7 +7802,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ // copy and assignment are not allowed
-+ StructDef_tie (const StructDef_tie &);
-+ void operator= (const StructDef_tie &);
-+ };
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -7915,7 +7810,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+#endif /* ACE_HAS_USING_KEYWORD */
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -7923,7 +7818,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class UnionDef;
-+ typedef UnionDef *UnionDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_UnionDef_ThruPOA_Proxy_Impl;
-+ class _TAO_UnionDef_Strategized_Proxy_Broker;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -7931,7 +7826,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class UnionDef : public virtual TypedefDef, public virtual Container
-+ {
-+ protected:
-+ UnionDef (void);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -7939,7 +7834,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ public:
-+ UnionDef (const UnionDef& rhs);
-+ virtual ~UnionDef (void);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -7947,7 +7842,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -7955,7 +7850,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -7963,7 +7858,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_type_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -7971,7 +7866,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7979,7 +7874,7 @@
+ 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 ()
-+ );
-
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -7987,11 +7882,10 @@
+ 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 ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-
--#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_ServerRequestInfo_IR_StructDef_members_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::StructDef;
-- TAO_ServerRequestInfo_IR_StructDef_members_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::StructDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_UnionDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual Dynamic::ParameterList * arguments (
-+ virtual const char* _interface_repository_id (void) const;
-+
-+ virtual CORBA::TypeCode_ptr discriminator_type (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-+
-+ static void _get_discriminator_type_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-+ );
-+
-+ virtual IR_IDLType_ptr discriminator_type_def (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_StructDef_members_get (const TAO_ServerRequestInfo_IR_StructDef_members_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_StructDef_members_get &);
--
-- private:
-- POA_IR::StructDef *_tao_impl;
-- void result (IR::StructMemberSeq * result);
-- // update the result
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -8045,7 +7939,7 @@
+ POA_IR::StructDef *_tao_impl;
+ void result (IR::StructMemberSeq * result);
+ // update the result
-IR::StructMemberSeq * _result;
--};
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ IR_StructMemberSeq * _result;
+ };
--class TAO_ServerRequestInfo_IR_StructDef_members_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::StructDef;
-- TAO_ServerRequestInfo_IR_StructDef_members_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::StructDef *tao_impl
-- ,
+ class TAO_ServerRequestInfo_IR_StructDef_members_set : public TAO_ServerRequestInfo
+@@ -8056,7 +7950,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::StructDef *tao_impl
+ ,
- const IR::StructMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_discriminator_type_def_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_StructDef_members_set (const TAO_ServerRequestInfo_IR_StructDef_members_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_StructDef_members_set &);
--
--private:
-- POA_IR::StructDef *_tao_impl;
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -8095,27 +7989,26 @@
+
+ private:
+ POA_IR::StructDef *_tao_impl;
- const IR::StructMemberSeq & members_;
--};
-+ virtual void discriminator_type_def (
-+ IR_IDLType_ptr discriminator_type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--#endif /* TAO_HAS_INTERCEPTORS */
-+ static void _set_discriminator_type_def_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ const IR_StructMemberSeq & members_;
+ };
--};
-+ virtual IR_UnionMemberSeq * members (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-+ static void _get_members_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Declaration
--//
-+ virtual void members (
-+ const IR_UnionMemberSeq & members,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--class _TAO_StructDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_StructDef_Proxy_Broker
--{
--public:
-- _TAO_StructDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_StructDef_Strategized_Proxy_Broker (void);
--
-- virtual ::IR::_TAO_StructDef_Proxy_Impl &select_proxy (
-- ::IR::StructDef *object,
-- CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-- );
-+ static void _set_members_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+ #endif /* TAO_HAS_INTERCEPTORS */
--private:
-+ static void lookup_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--// 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
-- );
-+ static void contents_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ };
--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.
-- ::IR::_TAO_StructDef_Proxy_Impl
-- *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
--
-- TAO_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.
-+ static void lookup_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+-
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Declaration
+ //
--public:
-- static _TAO_StructDef_Strategized_Proxy_Broker *the_TAO_StructDef_Strategized_Proxy_Broker (void);
--};
-+ static void describe_contents_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void create_module_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--//
--// End Strategized Proxy Broker Declaration
--///////////////////////////////////////////////////////////////////////
-+ static void create_constant_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void create_struct_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Impl. Declaration
--//
-+ static void create_union_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--class _TAO_StructDef_ThruPOA_Proxy_Impl :
-- public virtual ::IR::_TAO_StructDef_Proxy_Impl,
-- public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl
--
-+ static void create_enum_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_alias_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_interface_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_value_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_value_box_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_exception_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_native_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_type_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
-+
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Declaration
-+//
-+
-+class _TAO_UnionDef_Strategized_Proxy_Broker : public virtual _TAO_UnionDef_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_StructDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_StructDef_Proxy_Broker
++class _TAO_StructDef_Strategized_Proxy_Broker : public virtual _TAO_StructDef_Proxy_Broker
{
--public:
-- _TAO_StructDef_ThruPOA_Proxy_Impl (void);
-+public:
-+ _TAO_UnionDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_UnionDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_UnionDef_Proxy_Impl &select_proxy (
-+ IR_UnionDef *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:
+ public:
+ _TAO_StructDef_Strategized_Proxy_Broker (void);
-- virtual ~_TAO_StructDef_ThruPOA_Proxy_Impl (void) { }
-+ // 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_UnionDef_Proxy_Impl
-+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
+ virtual ~_TAO_StructDef_Strategized_Proxy_Broker (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
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ TAO_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.
+- virtual ::IR::_TAO_StructDef_Proxy_Impl &select_proxy (
+- ::IR::StructDef *object,
++ virtual _TAO_StructDef_Proxy_Impl &select_proxy (
++ IR_StructDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
-+public:
-+ static _TAO_UnionDef_Strategized_Proxy_Broker *the_TAO_UnionDef_Strategized_Proxy_Broker (void);
+@@ -8133,7 +8026,7 @@
+ // 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.
+- ::IR::_TAO_StructDef_Proxy_Impl
++ _TAO_StructDef_Proxy_Impl
+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
+
+ TAO_SYNCH_MUTEX mutex_;
+@@ -8145,7 +8038,6 @@
+ static _TAO_StructDef_Strategized_Proxy_Broker *the_TAO_StructDef_Strategized_Proxy_Broker (void);
};
-
//
--// ThruPOA Proxy Impl. Declaration
-+// End Strategized Proxy Broker Declaration
+ // End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
+@@ -8155,8 +8047,8 @@
+ // ThruPOA Impl. Declaration
+ //
+-class TAO_IFR_Client_Export _TAO_StructDef_ThruPOA_Proxy_Impl :
+- public virtual ::IR::_TAO_StructDef_Proxy_Impl,
++class _TAO_StructDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_StructDef_Proxy_Impl,
+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
+ public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl,
+ public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl
+@@ -8167,7 +8059,7 @@
+
+ virtual ~_TAO_StructDef_ThruPOA_Proxy_Impl (void) { }
+
+- virtual IR::StructMemberSeq * members (
++ virtual IR_StructMemberSeq * members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -8177,7 +8069,7 @@
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class StructDef_tie : public StructDef
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Impl. Declaration
-+//
-+
-+class _TAO_UnionDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_UnionDef_Proxy_Impl,
-+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl
-+
+ virtual void members (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::StructMemberSeq & members,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -8191,11 +8083,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export StructDef_tie : public StructDef
++ class StructDef_tie : public StructDef
{
public:
-- StructDef_tie (T &t);
-- // the T& ctor
-- StructDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- StructDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- StructDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~StructDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
+ StructDef_tie (T &t);
+@@ -8223,10 +8114,10 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
- IR::StructMemberSeq * members (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ _TAO_UnionDef_ThruPOA_Proxy_Impl (void);
-+
-+ virtual ~_TAO_UnionDef_ThruPOA_Proxy_Impl (void);
-+
-+ virtual CORBA::TypeCode_ptr discriminator_type (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_StructMemberSeq * members (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
+@@ -8235,7 +8126,7 @@
));
-- void members (
+ void members (
- const IR::StructMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual IR_IDLType_ptr discriminator_type_def (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -8243,7 +8134,7 @@
CORBA::SystemException
));
- IR::Contained_ptr lookup (
-- const char * search_name,
-- CORBA::Environment &ACE_TRY_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 ((
++ IR_Contained_ptr lookup (
+ const char * search_name,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -8252,8 +8143,8 @@
CORBA::SystemException
));
- IR::ContainedSeq * contents (
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual IR_UnionMemberSeq * members (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
++ IR_ContainedSeq * contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -8262,10 +8153,10 @@
CORBA::SystemException
));
- IR::ContainedSeq * lookup_name (
-- const char * search_name,
-- CORBA::Long levels_to_search,
++ IR_ContainedSeq * lookup_name (
+ const char * search_name,
+ CORBA::Long levels_to_search,
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual void members (
-+ CORBA_Object *_collocated_tao_target_,
-+ const IR_UnionMemberSeq & members,
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -8274,8 +8165,8 @@
CORBA::SystemException
));
- 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
-- ));
-+};
++ IR_Container::DescriptionSeq * describe_contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Long max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -8285,7 +8176,7 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
++ IR_ModuleDef_ptr create_module (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -8296,11 +8187,11 @@
+ CORBA::SystemException
+ ));
- IR::ConstantDef_ptr create_constant (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
++ IR_IDLType_ptr type,
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -8309,11 +8200,11 @@
+ CORBA::SystemException
+ ));
- IR::StructDef_ptr create_struct (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class UnionDef_tie : public UnionDef
-+ {
-+ public:
-+ UnionDef_tie (T &t);
-+ // the T& ctor
-+ UnionDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ UnionDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ UnionDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~UnionDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ CORBA::TypeCode_ptr discriminator_type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -8321,12 +8212,12 @@
+ CORBA::SystemException
+ ));
- IR::UnionDef_ptr create_union (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ IR_IDLType_ptr discriminator_type_def (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr discriminator_type,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -8334,11 +8225,11 @@
+ CORBA::SystemException
+ ));
- IR::EnumDef_ptr create_enum (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ void discriminator_type_def (
-+ IR_IDLType_ptr discriminator_type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -8346,11 +8237,11 @@
+ CORBA::SystemException
+ ));
- IR::AliasDef_ptr create_alias (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ IR_UnionMemberSeq * members (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr original_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -8358,11 +8249,11 @@
+ CORBA::SystemException
+ ));
- IR::InterfaceDef_ptr create_interface (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ void members (
-+ const IR_UnionMemberSeq & members,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -8372,17 +8263,17 @@
+ CORBA::SystemException
+ ));
- 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 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,
++ 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
-- ));
-+ IR_Contained_ptr lookup (
-+ const char * search_name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_ValueDefSeq & abstract_base_values,
++ const IR_InterfaceDefSeq & supported_interfaces,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -8390,11 +8281,11 @@
+ CORBA::SystemException
+ ));
- IR::ValueBoxDef_ptr create_value_box (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ IR_ContainedSeq * contents (
-+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -8402,11 +8293,11 @@
+ CORBA::SystemException
+ ));
- IR::ExceptionDef_ptr create_exception (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ IR_ContainedSeq * lookup_name (
-+ const char * search_name,
-+ CORBA::Long levels_to_search,
-+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -8414,7 +8305,7 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
-+ 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
-+ ));
-
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
-
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
-
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
-
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
-
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
-
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
++ IR_NativeDef_ptr create_native (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -8476,7 +8367,7 @@
+ CORBA::SystemException
+ ));
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
-
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -8492,7 +8383,7 @@
+ CORBA::SystemException
+ ));
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -8500,7 +8391,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
-
-- void move (
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -8509,7 +8400,7 @@
+ ));
+
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
-
-- CORBA::TypeCode_ptr type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -8527,7 +8418,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- StructDef_tie (const StructDef_tie &);
-- void operator= (const StructDef_tie &);
--};
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--#endif /* ACE_HAS_USING_KEYWORD */
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class UnionDef;
--typedef UnionDef *UnionDef_ptr;
--// Forward Classes Declaration
--class _TAO_UnionDef_ThruPOA_Proxy_Impl;
--class _TAO_UnionDef_Strategized_Proxy_Broker;
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class UnionDef : public virtual TypedefDef, public virtual Container
--{
--protected:
-- UnionDef (void);
-+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--public:
-- UnionDef (const UnionDef& rhs);
-- virtual ~UnionDef (void);
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void _dispatch (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -8561,7 +8452,7 @@
+ class _TAO_UnionDef_ThruPOA_Proxy_Impl;
+ class _TAO_UnionDef_Strategized_Proxy_Broker;
-- ::IR::UnionDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-
-- virtual const char* _interface_repository_id (void) const;
-+ // copy and assignment are not allowed
-+ UnionDef_tie (const UnionDef_tie &);
-+ void operator= (const UnionDef_tie &);
-+ };
-
-- virtual CORBA::TypeCode_ptr discriminator_type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+#endif /* ACE_HAS_USING_KEYWORD */
+-class TAO_IFR_Client_Export UnionDef : public virtual TypedefDef, public virtual Container
++ class UnionDef : public virtual TypedefDef, public virtual Container
+ {
+ protected:
+ UnionDef (void);
+@@ -8604,7 +8495,7 @@
+ TAO_default_environment ()
+ );
-- static void _get_discriminator_type_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class EnumDef;
-+ typedef EnumDef *EnumDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_EnumDef_ThruPOA_Proxy_Impl;
-+ class _TAO_EnumDef_Strategized_Proxy_Broker;
+- ::IR::UnionDef *_this (
++ IR_UnionDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -8627,7 +8518,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::IDLType_ptr discriminator_type_def (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ class EnumDef : public virtual TypedefDef
-+ {
-+ protected:
-+ EnumDef (void);
-
-- static void _get_discriminator_type_def_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ public:
-+ EnumDef (const EnumDef& rhs);
-+ virtual ~EnumDef (void);
++ virtual IR_IDLType_ptr discriminator_type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -8644,7 +8535,7 @@
+ );
-- virtual void discriminator_type_def (
+ virtual void discriminator_type_def (
- IR::IDLType_ptr discriminator_type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-
-- static void _set_discriminator_type_def_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ IR_IDLType_ptr discriminator_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -8660,7 +8551,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::UnionMemberSeq * members (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
-
-- static void _get_members_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual void members (
++ virtual IR_UnionMemberSeq * members (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -8677,7 +8568,7 @@
+ );
+
+ virtual void members (
- const IR::UnionMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _non_existent_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_members_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_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 ()
-+ );
-
-- static void lookup_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -8697,7 +8588,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_EnumDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void contents_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -8705,7 +8596,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual const char* _interface_repository_id (void) const;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void lookup_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -8713,7 +8604,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_EnumMemberSeq * members (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void describe_contents_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -8721,7 +8612,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_members_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_module_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -8729,7 +8620,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void members (
-+ const IR_EnumMemberSeq & members,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void create_constant_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -8737,7 +8628,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_members_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_struct_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -8745,7 +8636,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_union_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -8753,7 +8644,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_enum_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -8761,7 +8652,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_alias_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -8769,7 +8660,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_interface_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -8777,7 +8668,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_value_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -8785,7 +8676,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_value_box_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -8793,7 +8684,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_exception_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -8801,7 +8692,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_native_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -8809,7 +8700,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -8817,7 +8708,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -8825,7 +8716,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -8833,7 +8724,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_type_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -8841,7 +8732,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -8849,7 +8740,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
-
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -8857,7 +8748,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Declaration
-+//
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -8865,7 +8756,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+class _TAO_EnumDef_Strategized_Proxy_Broker : public virtual _TAO_EnumDef_Proxy_Broker
-+{
-+public:
-+ _TAO_EnumDef_Strategized_Proxy_Broker (void);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -8873,7 +8764,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual ~_TAO_EnumDef_Strategized_Proxy_Broker (void);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -8881,7 +8772,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual _TAO_EnumDef_Proxy_Impl &select_proxy (
-+ IR_EnumDef *object,
-+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -8889,7 +8780,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+private:
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+// 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
-+ );
-
-- static void _get_type_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -8897,7 +8788,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+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_EnumDef_Proxy_Impl
-+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-+
-+ TAO_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.
-
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+public:
-+ static _TAO_EnumDef_Strategized_Proxy_Broker *the_TAO_EnumDef_Strategized_Proxy_Broker (void);
-+};
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
--
--#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_ServerRequestInfo_IR_UnionDef_discriminator_type_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::UnionDef;
-- TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::UnionDef *tao_impl
-- ,
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get (const TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get &);
--
-- private:
-- POA_IR::UnionDef *_tao_impl;
-- void result (CORBA::TypeCode_ptr result);
-- // update the result
--CORBA::TypeCode_ptr _result;
--};
--
--class TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::UnionDef;
-- TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::UnionDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual Dynamic::ParameterList * arguments (
+@@ -8905,7 +8796,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -8913,7 +8804,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -8921,11 +8812,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get (const TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get &);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
-
--private:
-- POA_IR::UnionDef *_tao_impl;
-- void result (IR::IDLType_ptr result);
-- // update the result
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -9030,7 +8920,7 @@
+ POA_IR::UnionDef *_tao_impl;
+ void result (IR::IDLType_ptr result);
+ // update the result
-IR::IDLType_ptr _result;
--};
--
--class TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::UnionDef;
-- TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::UnionDef *tao_impl
-- ,
++ IR_IDLType_ptr _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set : public TAO_ServerRequestInfo
+@@ -9041,7 +8931,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::UnionDef *tao_impl
+ ,
- 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));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set (const TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set &);
--
--private:
-- POA_IR::UnionDef *_tao_impl;
++ IR_IDLType_ptr discriminator_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -9080,7 +8970,7 @@
+
+ private:
+ POA_IR::UnionDef *_tao_impl;
- IR::IDLType_ptr discriminator_type_def_;
--};
--
--class TAO_ServerRequestInfo_IR_UnionDef_members_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::UnionDef;
-- TAO_ServerRequestInfo_IR_UnionDef_members_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::UnionDef *tao_impl
-- ,
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_UnionDef_members_get (const TAO_ServerRequestInfo_IR_UnionDef_members_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_UnionDef_members_get &);
--
--private:
-- POA_IR::UnionDef *_tao_impl;
-- void result (IR::UnionMemberSeq * result);
-- // update the result
++ IR_IDLType_ptr discriminator_type_def_;
+ };
+
+ class TAO_ServerRequestInfo_IR_UnionDef_members_get : public TAO_ServerRequestInfo
+@@ -9131,7 +9021,7 @@
+ POA_IR::UnionDef *_tao_impl;
+ void result (IR::UnionMemberSeq * result);
+ // update the result
-IR::UnionMemberSeq * _result;
--};
--
--class TAO_ServerRequestInfo_IR_UnionDef_members_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::UnionDef;
-- TAO_ServerRequestInfo_IR_UnionDef_members_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::UnionDef *tao_impl
-- ,
++ IR_UnionMemberSeq * _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_UnionDef_members_set : public TAO_ServerRequestInfo
+@@ -9142,7 +9032,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::UnionDef *tao_impl
+ ,
- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_UnionDef_members_set (const TAO_ServerRequestInfo_IR_UnionDef_members_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_UnionDef_members_set &);
--
--private:
-- POA_IR::UnionDef *_tao_impl;
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -9181,27 +9071,26 @@
+
+ private:
+ POA_IR::UnionDef *_tao_impl;
- const IR::UnionMemberSeq & members_;
--};
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--};
--
--
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Declaration
--//
++ const IR_UnionMemberSeq & members_;
+ };
+
+ #endif /* TAO_HAS_INTERCEPTORS */
+
+ };
+
-
--class _TAO_UnionDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_UnionDef_Proxy_Broker
--{
--public:
-- _TAO_UnionDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_UnionDef_Strategized_Proxy_Broker (void);
--
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Declaration
+ //
+
+-class TAO_IFR_Client_Export _TAO_UnionDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_UnionDef_Proxy_Broker
++class _TAO_UnionDef_Strategized_Proxy_Broker : public virtual _TAO_UnionDef_Proxy_Broker
+ {
+ public:
+ _TAO_UnionDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_UnionDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_UnionDef_Proxy_Impl &select_proxy (
- ::IR::UnionDef *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.
-- ::IR::_TAO_UnionDef_Proxy_Impl
-- *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
--
-- TAO_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:
-- static _TAO_UnionDef_Strategized_Proxy_Broker *the_TAO_UnionDef_Strategized_Proxy_Broker (void);
--};
--
--
--//
--// End Strategized Proxy Broker Declaration
--///////////////////////////////////////////////////////////////////////
-+//
-+// End Strategized Proxy Broker Declaration
-+///////////////////////////////////////////////////////////////////////
++ virtual _TAO_UnionDef_Proxy_Impl &select_proxy (
++ IR_UnionDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+@@ -9219,7 +9108,7 @@
+ // 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.
+- ::IR::_TAO_UnionDef_Proxy_Impl
++ _TAO_UnionDef_Proxy_Impl
+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
+
+ TAO_SYNCH_MUTEX mutex_;
+@@ -9231,7 +9120,6 @@
+ static _TAO_UnionDef_Strategized_Proxy_Broker *the_TAO_UnionDef_Strategized_Proxy_Broker (void);
+ };
+-
+ //
+ // End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
+@@ -9241,8 +9129,8 @@
// ThruPOA Impl. Declaration
//
--class _TAO_UnionDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_UnionDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_UnionDef_Proxy_Impl,
-+class _TAO_EnumDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_EnumDef_Proxy_Impl,
++class _TAO_UnionDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_UnionDef_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl
-+ public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl
-
- {
- public:
-- _TAO_UnionDef_ThruPOA_Proxy_Impl (void);
-+ _TAO_EnumDef_ThruPOA_Proxy_Impl (void);
-
-- virtual ~_TAO_UnionDef_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_EnumDef_ThruPOA_Proxy_Impl (void);
-
-- virtual CORBA::TypeCode_ptr discriminator_type (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
+ public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl,
+ public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl
+@@ -9261,7 +9149,7 @@
+ CORBA::SystemException
+ ));
+
- virtual IR::IDLType_ptr discriminator_type_def (
-- 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
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- virtual IR::UnionMemberSeq * members (
-+ virtual IR_EnumMemberSeq * members (
++ virtual IR_IDLType_ptr discriminator_type_def (
CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -9271,14 +9159,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 void members (
-+ virtual void members (
+- virtual IR::UnionMemberSeq * members (
++ virtual IR_UnionMemberSeq * members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -9288,7 +9176,7 @@
+
+ virtual void members (
CORBA_Object *_collocated_tao_target_,
- const IR::UnionMemberSeq & members,
-+ const IR_EnumMemberSeq & members,
++ const IR_UnionMemberSeq & members,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -9302,1303 +7016,1168 @@
+@@ -9302,11 +9190,10 @@
// ThruPOA Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-
#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class UnionDef_tie : public UnionDef
--{
--public:
-- UnionDef_tie (T &t);
-- // the T& ctor
-- UnionDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- UnionDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- UnionDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~UnionDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- CORBA::TypeCode_ptr discriminator_type (
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export UnionDef_tie : public UnionDef
++ class UnionDef_tie : public UnionDef
+ {
+ public:
+ UnionDef_tie (T &t);
+@@ -9334,7 +9221,7 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+ CORBA::TypeCode_ptr discriminator_type (
+@@ -9345,7 +9232,7 @@
+ CORBA::SystemException
+ ));
+
- IR::IDLType_ptr discriminator_type_def (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class EnumDef_tie : public EnumDef
-+ {
-+ public:
-+ EnumDef_tie (T &t);
-+ // the T& ctor
-+ EnumDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ EnumDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ EnumDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~EnumDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ IR_EnumMemberSeq * members (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void discriminator_type_def (
++ IR_IDLType_ptr discriminator_type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -9354,7 +9241,7 @@
+ ));
+
+ void discriminator_type_def (
- IR::IDLType_ptr discriminator_type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void members (
-+ const IR_EnumMemberSeq & members,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr discriminator_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -9362,7 +9249,7 @@
+ CORBA::SystemException
+ ));
- IR::UnionMemberSeq * members (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void members (
++ IR_UnionMemberSeq * members (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -9371,7 +9258,7 @@
+ ));
+
+ void members (
- const IR::UnionMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -9379,7 +9266,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained_ptr lookup (
-- const char * search_name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Contained_ptr lookup (
+ const char * search_name,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -9388,8 +9275,8 @@
+ CORBA::SystemException
+ ));
- IR::ContainedSeq * contents (
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_ContainedSeq * contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -9398,10 +9285,10 @@
+ CORBA::SystemException
+ ));
- IR::ContainedSeq * lookup_name (
-- const char * search_name,
-- CORBA::Long levels_to_search,
++ IR_ContainedSeq * lookup_name (
+ const char * search_name,
+ CORBA::Long levels_to_search,
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -9410,8 +9297,8 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Container::DescriptionSeq * describe_contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Long max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -9421,7 +9308,7 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
-+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_ModuleDef_ptr create_module (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -9432,11 +9319,11 @@
+ CORBA::SystemException
+ ));
- IR::ConstantDef_ptr create_constant (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr type,
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -9445,11 +9332,11 @@
+ CORBA::SystemException
+ ));
- IR::StructDef_ptr create_struct (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -9457,12 +9344,12 @@
+ CORBA::SystemException
+ ));
- IR::UnionDef_ptr create_union (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr discriminator_type,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -9470,11 +9357,11 @@
+ CORBA::SystemException
+ ));
- IR::EnumDef_ptr create_enum (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -9482,11 +9369,11 @@
+ CORBA::SystemException
+ ));
- IR::AliasDef_ptr create_alias (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr original_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -9494,11 +9381,11 @@
+ CORBA::SystemException
+ ));
- IR::InterfaceDef_ptr create_interface (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -9508,17 +9395,17 @@
+ CORBA::SystemException
+ ));
- 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 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,
++ 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
-- ));
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_ValueDefSeq & abstract_base_values,
++ const IR_InterfaceDefSeq & supported_interfaces,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -9526,11 +9413,11 @@
+ CORBA::SystemException
+ ));
- IR::ValueBoxDef_ptr create_value_box (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -9538,11 +9425,11 @@
+ CORBA::SystemException
+ ));
- IR::ExceptionDef_ptr create_exception (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ // copy and assignment are not allowed
-+ EnumDef_tie (const EnumDef_tie &);
-+ void operator= (const EnumDef_tie &);
-+ };
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -9550,7 +9437,7 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
-+#endif /* ACE_HAS_USING_KEYWORD */
-
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ class AliasDef;
-+ typedef AliasDef *AliasDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_AliasDef_ThruPOA_Proxy_Impl;
-+ class _TAO_AliasDef_Strategized_Proxy_Broker;
-
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ class AliasDef : public virtual TypedefDef
-+ {
-+ protected:
-+ AliasDef (void);
-
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ public:
-+ AliasDef (const AliasDef& rhs);
-+ virtual ~AliasDef (void);
-
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
++ IR_NativeDef_ptr create_native (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -9612,7 +9499,7 @@
+ CORBA::SystemException
+ ));
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _non_existent_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -9628,7 +9515,7 @@
+ CORBA::SystemException
+ ));
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual void _dispatch (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -9636,7 +9523,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_AliasDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -9645,7 +9532,7 @@
+ ));
-- void move (
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual const char* _interface_repository_id (void) const;
-
-- CORBA::TypeCode_ptr type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual IR_IDLType_ptr original_type_def (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -9663,7 +9550,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _get_original_type_def_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual void original_type_def (
-+ IR_IDLType_ptr original_type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- UnionDef_tie (const UnionDef_tie &);
-- void operator= (const UnionDef_tie &);
--};
-+ static void _set_original_type_def_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -9697,7 +9584,7 @@
+ class _TAO_EnumDef_ThruPOA_Proxy_Impl;
+ class _TAO_EnumDef_Strategized_Proxy_Broker;
--#endif /* ACE_HAS_USING_KEYWORD */
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--class EnumDef;
--typedef EnumDef *EnumDef_ptr;
--// Forward Classes Declaration
--class _TAO_EnumDef_ThruPOA_Proxy_Impl;
--class _TAO_EnumDef_Strategized_Proxy_Broker;
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_type_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
-+
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Declaration
-+//
-
--class EnumDef : public virtual TypedefDef
-+class _TAO_AliasDef_Strategized_Proxy_Broker : public virtual _TAO_AliasDef_Proxy_Broker
+-class TAO_IFR_Client_Export EnumDef : public virtual TypedefDef
++ class EnumDef : public virtual TypedefDef
{
--protected:
-- EnumDef (void);
-+public:
-+ _TAO_AliasDef_Strategized_Proxy_Broker (void);
-
--public:
-- EnumDef (const EnumDef& rhs);
-- virtual ~EnumDef (void);
-+ virtual ~_TAO_AliasDef_Strategized_Proxy_Broker (void);
-
-+ virtual _TAO_AliasDef_Proxy_Impl &select_proxy (
-+ IR_AliasDef *object,
-+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-+ );
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+private:
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+// 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
-+ );
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+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_AliasDef_Proxy_Impl
-+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-+
-+ TAO_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.
-
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+public:
-+ static _TAO_AliasDef_Strategized_Proxy_Broker *the_TAO_AliasDef_Strategized_Proxy_Broker (void);
-+};
-
-- virtual void _dispatch (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+//
-+// End Strategized Proxy Broker Declaration
-+///////////////////////////////////////////////////////////////////////
+ protected:
+ EnumDef (void);
+@@ -9740,14 +9627,14 @@
+ TAO_default_environment ()
+ );
- ::IR::EnumDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ IR_EnumDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
-- virtual const char* _interface_repository_id (void) const;
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Impl. Declaration
-+//
+ virtual const char* _interface_repository_id (void) const;
- virtual IR::EnumMemberSeq * members (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+class _TAO_AliasDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_AliasDef_Proxy_Impl,
-+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl
-+
-+{
-+public:
-+ _TAO_AliasDef_ThruPOA_Proxy_Impl (void);
-+
-+ virtual ~_TAO_AliasDef_ThruPOA_Proxy_Impl (void);
-+
-+ virtual IR_IDLType_ptr original_type_def (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
++ virtual IR_EnumMemberSeq * members (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
-- )) = 0;
--
-- static void _get_members_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ ));
+@@ -9764,7 +9651,7 @@
+ );
-- virtual void members (
+ virtual void members (
- const IR::EnumMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual void original_type_def (
-+ CORBA_Object *_collocated_tao_target_,
-+ IR_IDLType_ptr original_type_def,
-+ CORBA::Environment &ACE_TRY_ENV
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
-- )) = 0;
-+ ));
+@@ -9784,7 +9671,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _set_members_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
+@@ -9792,7 +9679,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+};
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -9800,7 +9687,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -9808,7 +9695,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -9816,7 +9703,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class AliasDef_tie : public AliasDef
-+ {
-+ public:
-+ AliasDef_tie (T &t);
-+ // the T& ctor
-+ AliasDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ AliasDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ AliasDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~AliasDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ IR_IDLType_ptr original_type_def (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void original_type_def (
-+ IR_IDLType_ptr original_type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -9824,7 +9711,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -9832,7 +9719,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -9840,7 +9727,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -9848,7 +9735,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -9856,7 +9743,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -9864,7 +9751,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_type_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -9872,7 +9759,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -9880,7 +9767,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -9888,11 +9775,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-
--#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_ServerRequestInfo_IR_EnumDef_members_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::EnumDef;
-- TAO_ServerRequestInfo_IR_EnumDef_members_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::EnumDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual Dynamic::ParameterList * arguments (
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ CORBA::TypeCode_ptr type (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ IR_DefinitionKind def_kind (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_EnumDef_members_get (const TAO_ServerRequestInfo_IR_EnumDef_members_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_EnumDef_members_get &);
--
-- private:
-- POA_IR::EnumDef *_tao_impl;
-- void result (IR::EnumMemberSeq * result);
-- // update the result
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -9946,7 +9832,7 @@
+ POA_IR::EnumDef *_tao_impl;
+ void result (IR::EnumMemberSeq * result);
+ // update the result
-IR::EnumMemberSeq * _result;
--};
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_EnumMemberSeq * _result;
+ };
--class TAO_ServerRequestInfo_IR_EnumDef_members_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::EnumDef;
-- TAO_ServerRequestInfo_IR_EnumDef_members_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::EnumDef *tao_impl
-- ,
+ class TAO_ServerRequestInfo_IR_EnumDef_members_set : public TAO_ServerRequestInfo
+@@ -9957,7 +9843,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::EnumDef *tao_impl
+ ,
- const IR::EnumMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void destroy (
-+ 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 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -9996,27 +9882,26 @@
+
private:
-- TAO_ServerRequestInfo_IR_EnumDef_members_set (const TAO_ServerRequestInfo_IR_EnumDef_members_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_EnumDef_members_set &);
--
--private:
-- POA_IR::EnumDef *_tao_impl;
+ POA_IR::EnumDef *_tao_impl;
- const IR::EnumMemberSeq & members_;
--};
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-
--#endif /* TAO_HAS_INTERCEPTORS */
-+ // copy and assignment are not allowed
-+ AliasDef_tie (const AliasDef_tie &);
-+ void operator= (const AliasDef_tie &);
-+ };
++ const IR_EnumMemberSeq & members_;
+ };
--};
-+#endif /* ACE_HAS_USING_KEYWORD */
+ #endif /* TAO_HAS_INTERCEPTORS */
-+ class NativeDef;
-+ typedef NativeDef *NativeDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_NativeDef_ThruPOA_Proxy_Impl;
-+ class _TAO_NativeDef_Strategized_Proxy_Broker;
+ };
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Declaration
--//
-+ class NativeDef : public virtual TypedefDef
-+ {
-+ protected:
-+ NativeDef (void);
+-
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Declaration
+ //
--class _TAO_EnumDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_EnumDef_Proxy_Broker
--{
--public:
-- _TAO_EnumDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_EnumDef_Strategized_Proxy_Broker (void);
--
+-class TAO_IFR_Client_Export _TAO_EnumDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_EnumDef_Proxy_Broker
++class _TAO_EnumDef_Strategized_Proxy_Broker : public virtual _TAO_EnumDef_Proxy_Broker
+ {
+ public:
+ _TAO_EnumDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_EnumDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_EnumDef_Proxy_Impl &select_proxy (
- ::IR::EnumDef *object,
-- CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-- );
-+ public:
-+ NativeDef (const NativeDef& rhs);
-+ virtual ~NativeDef (void);
-
--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
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ virtual _TAO_EnumDef_Proxy_Impl &select_proxy (
++ IR_EnumDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
--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.
+@@ -10034,7 +9919,7 @@
+ // 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.
- ::IR::_TAO_EnumDef_Proxy_Impl
-- *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
--
-- TAO_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.
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
-
--public:
-- static _TAO_EnumDef_Strategized_Proxy_Broker *the_TAO_EnumDef_Strategized_Proxy_Broker (void);
--};
-+ static void _is_a_skel (
-+ 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 ()
-+ );
-
--//
--// End Strategized Proxy Broker Declaration
--///////////////////////////////////////////////////////////////////////
-+ virtual void _dispatch (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-+ IR_NativeDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ _TAO_EnumDef_Proxy_Impl
+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
+
+ TAO_SYNCH_MUTEX mutex_;
+@@ -10046,7 +9931,6 @@
+ static _TAO_EnumDef_Strategized_Proxy_Broker *the_TAO_EnumDef_Strategized_Proxy_Broker (void);
+ };
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Impl. Declaration
--//
-+ virtual const char* _interface_repository_id (void) const;
+-
+ //
+ // End Strategized Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -10056,8 +9940,8 @@
+ // ThruPOA Impl. Declaration
+ //
--class _TAO_EnumDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_EnumDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_EnumDef_Proxy_Impl,
-- public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl
--
--{
--public:
-- _TAO_EnumDef_ThruPOA_Proxy_Impl (void);
--
-- virtual ~_TAO_EnumDef_ThruPOA_Proxy_Impl (void) { }
--
++class _TAO_EnumDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_EnumDef_Proxy_Impl,
+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
+ public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl
+
+@@ -10067,7 +9951,7 @@
+
+ virtual ~_TAO_EnumDef_ThruPOA_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
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
--};
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class EnumDef_tie : public EnumDef
--{
--public:
-- EnumDef_tie (T &t);
-- // the T& ctor
-- EnumDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- EnumDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- EnumDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~EnumDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- IR::EnumMemberSeq * members (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ virtual IR_EnumMemberSeq * members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -10077,7 +9961,7 @@
-- void members (
+ virtual void members (
+ CORBA_Object *_collocated_tao_target_,
- const IR::EnumMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -10091,11 +9975,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
-- char * version (
+-
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export EnumDef_tie : public EnumDef
++ class EnumDef_tie : public EnumDef
+ {
+ public:
+ EnumDef_tie (T &t);
+@@ -10123,10 +10006,10 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
+- IR::EnumMemberSeq * members (
++ IR_EnumMemberSeq * members (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -10135,7 +10018,7 @@
+ ));
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _get_type_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ void members (
+- const IR::EnumMemberSeq & members,
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -10194,7 +10077,7 @@
+ CORBA::SystemException
+ ));
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -10210,7 +10093,7 @@
+ CORBA::SystemException
+ ));
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Declaration
-+//
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -10218,7 +10101,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+class _TAO_NativeDef_Strategized_Proxy_Broker : public virtual _TAO_NativeDef_Proxy_Broker
-+{
-+public:
-+ _TAO_NativeDef_Strategized_Proxy_Broker (void);
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -10227,7 +10110,7 @@
+ ));
-- void move (
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual ~_TAO_NativeDef_Strategized_Proxy_Broker (void);
-
-- CORBA::TypeCode_ptr type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual _TAO_NativeDef_Proxy_Impl &select_proxy (
-+ IR_NativeDef *object,
-+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-+ );
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -10245,7 +10128,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+private:
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+// 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:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- EnumDef_tie (const EnumDef_tie &);
-- void operator= (const EnumDef_tie &);
-+
-+ // 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_NativeDef_Proxy_Impl
-+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-+
-+ TAO_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:
-+ static _TAO_NativeDef_Strategized_Proxy_Broker *the_TAO_NativeDef_Strategized_Proxy_Broker (void);
- };
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -10279,7 +10162,7 @@
+ class _TAO_AliasDef_ThruPOA_Proxy_Impl;
+ class _TAO_AliasDef_Strategized_Proxy_Broker;
--#endif /* ACE_HAS_USING_KEYWORD */
-+//
-+// End Strategized Proxy Broker Declaration
-+///////////////////////////////////////////////////////////////////////
+-class TAO_IFR_Client_Export AliasDef : public virtual TypedefDef
++ class AliasDef : public virtual TypedefDef
+ {
+ protected:
+ AliasDef (void);
+@@ -10322,14 +10205,14 @@
+ TAO_default_environment ()
+ );
--class AliasDef;
--typedef AliasDef *AliasDef_ptr;
--// Forward Classes Declaration
--class _TAO_AliasDef_ThruPOA_Proxy_Impl;
--class _TAO_AliasDef_Strategized_Proxy_Broker;
+- ::IR::AliasDef *_this (
++ IR_AliasDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
--class AliasDef : public virtual TypedefDef
--{
--protected:
-- AliasDef (void);
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Impl. Declaration
-+//
+ virtual const char* _interface_repository_id (void) const;
-+class _TAO_NativeDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_NativeDef_Proxy_Impl,
-+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl
-+
-+{
- public:
-- AliasDef (const AliasDef& rhs);
-- virtual ~AliasDef (void);
-+ _TAO_NativeDef_ThruPOA_Proxy_Impl (void);
-+
-+ virtual ~_TAO_NativeDef_ThruPOA_Proxy_Impl (void);
-+
-+};
+- virtual IR::IDLType_ptr original_type_def (
++ virtual IR_IDLType_ptr original_type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -10346,7 +10229,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 ()
+ )
+@@ -10366,7 +10249,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
+@@ -10374,7 +10257,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class NativeDef_tie : public NativeDef
-+ {
-+ public:
-+ NativeDef_tie (T &t);
-+ // the T& ctor
-+ NativeDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ NativeDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ NativeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~NativeDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void _dispatch (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+@@ -10382,7 +10265,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- ::IR::AliasDef *_this (
+@@ -10390,7 +10273,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual const char* _interface_repository_id (void) const;
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- virtual IR::IDLType_ptr original_type_def (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_original_type_def_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void original_type_def (
-- IR::IDLType_ptr original_type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_original_type_def_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -10398,7 +10281,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -10406,7 +10289,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ // copy and assignment are not allowed
-+ NativeDef_tie (const NativeDef_tie &);
-+ void operator= (const NativeDef_tie &);
-+ };
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -10414,7 +10297,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+#endif /* ACE_HAS_USING_KEYWORD */
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -10422,7 +10305,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class PrimitiveDef;
-+ typedef PrimitiveDef *PrimitiveDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl;
-+ class _TAO_PrimitiveDef_Strategized_Proxy_Broker;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -10430,7 +10313,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class PrimitiveDef : public virtual IDLType
-+ {
-+ protected:
-+ PrimitiveDef (void);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -10438,7 +10321,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ public:
-+ PrimitiveDef (const PrimitiveDef& rhs);
-+ virtual ~PrimitiveDef (void);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -10446,7 +10329,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_type_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -10454,7 +10337,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -10462,7 +10345,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -10470,11 +10353,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-
--#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_ServerRequestInfo_IR_AliasDef_original_type_def_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::AliasDef;
-- TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::AliasDef *tao_impl
-- ,
-- 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 ()
-+ );
-
-- virtual Dynamic::ParameterList * arguments (
-+ virtual void _dispatch (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_context,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
-+ );
-+
-+ IR_PrimitiveDef *_this (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-+ );
-+
-+ virtual const char* _interface_repository_id (void) const;
-+
-+ virtual IR_PrimitiveKind kind (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get (const TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get &);
--
-- private:
-- POA_IR::AliasDef *_tao_impl;
-- void result (IR::IDLType_ptr result);
-- // update the result
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -10528,7 +10410,7 @@
+ POA_IR::AliasDef *_tao_impl;
+ void result (IR::IDLType_ptr result);
+ // update the result
-IR::IDLType_ptr _result;
--};
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ IR_IDLType_ptr _result;
+ };
--class TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::AliasDef;
-- TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::AliasDef *tao_impl
-- ,
+ class TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set : public TAO_ServerRequestInfo
+@@ -10539,7 +10421,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::AliasDef *tao_impl
+ ,
- IR::IDLType_ptr original_type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_kind_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set (const TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set &);
--
--private:
-- POA_IR::AliasDef *_tao_impl;
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -10578,27 +10460,26 @@
+
+ private:
+ POA_IR::AliasDef *_tao_impl;
- IR::IDLType_ptr original_type_def_;
--};
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ static void _get_type_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_IDLType_ptr original_type_def_;
+ };
--};
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ #endif /* TAO_HAS_INTERCEPTORS */
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
+ };
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Declaration
//
--class _TAO_AliasDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_AliasDef_Proxy_Broker
-+class _TAO_PrimitiveDef_Strategized_Proxy_Broker : public virtual _TAO_PrimitiveDef_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_AliasDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_AliasDef_Proxy_Broker
++class _TAO_AliasDef_Strategized_Proxy_Broker : public virtual _TAO_AliasDef_Proxy_Broker
{
public:
-- _TAO_AliasDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_AliasDef_Strategized_Proxy_Broker (void);
--
+ _TAO_AliasDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_AliasDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_AliasDef_Proxy_Impl &select_proxy (
- ::IR::AliasDef *object,
-+ _TAO_PrimitiveDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_PrimitiveDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_PrimitiveDef_Proxy_Impl &select_proxy (
-+ IR_PrimitiveDef *object,
++ virtual _TAO_AliasDef_Proxy_Impl &select_proxy (
++ IR_AliasDef *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -10616,7 +8195,7 @@
+@@ -10616,7 +10497,7 @@
// 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.
- ::IR::_TAO_AliasDef_Proxy_Impl
-+ _TAO_PrimitiveDef_Proxy_Impl
++ _TAO_AliasDef_Proxy_Impl
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -10625,10 +8204,9 @@
- // interface.
-
- public:
-- static _TAO_AliasDef_Strategized_Proxy_Broker *the_TAO_AliasDef_Strategized_Proxy_Broker (void);
-+ static _TAO_PrimitiveDef_Strategized_Proxy_Broker *the_TAO_PrimitiveDef_Strategized_Proxy_Broker (void);
+@@ -10628,7 +10509,6 @@
+ static _TAO_AliasDef_Strategized_Proxy_Broker *the_TAO_AliasDef_Strategized_Proxy_Broker (void);
};
-
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-@@ -10638,29 +8216,20 @@
+@@ -10638,8 +10518,8 @@
// ThruPOA Impl. Declaration
//
--class _TAO_AliasDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_AliasDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_AliasDef_Proxy_Impl,
-+class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_PrimitiveDef_Proxy_Impl,
++class _TAO_AliasDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_AliasDef_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl
-+ public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
+ public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl
- {
- public:
-- _TAO_AliasDef_ThruPOA_Proxy_Impl (void);
-+ _TAO_PrimitiveDef_ThruPOA_Proxy_Impl (void);
+@@ -10649,7 +10529,7 @@
-- virtual ~_TAO_AliasDef_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_PrimitiveDef_ThruPOA_Proxy_Impl (void);
+ virtual ~_TAO_AliasDef_ThruPOA_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 (
-+ virtual IR_PrimitiveKind kind (
++ virtual IR_IDLType_ptr original_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -10659,7 +10539,7 @@
+
+ virtual void original_type_def (
CORBA_Object *_collocated_tao_target_,
- IR::IDLType_ptr original_type_def,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
- CORBA::SystemException
-@@ -10673,380 +8242,211 @@
+@@ -10673,11 +10553,10 @@
// ThruPOA Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-
#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class AliasDef_tie : public AliasDef
--{
--public:
-- AliasDef_tie (T &t);
-- // the T& ctor
-- AliasDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- AliasDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- AliasDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~AliasDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export AliasDef_tie : public AliasDef
++ class AliasDef_tie : public AliasDef
+ {
+ public:
+ AliasDef_tie (T &t);
+@@ -10705,10 +10584,10 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
- IR::IDLType_ptr original_type_def (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void original_type_def (
-- IR::IDLType_ptr original_type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class PrimitiveDef_tie : public PrimitiveDef
-+ {
-+ public:
-+ PrimitiveDef_tie (T &t);
-+ // the T& ctor
-+ PrimitiveDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ PrimitiveDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ PrimitiveDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~PrimitiveDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ IR_PrimitiveKind kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ // copy and assignment are not allowed
-+ PrimitiveDef_tie (const PrimitiveDef_tie &);
-+ void operator= (const PrimitiveDef_tie &);
-+ };
++ IR_IDLType_ptr original_type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -10717,7 +10596,7 @@
+ ));
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+#endif /* ACE_HAS_USING_KEYWORD */
+ void original_type_def (
+- IR::IDLType_ptr original_type_def,
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -10776,7 +10655,7 @@
+ CORBA::SystemException
+ ));
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ class StringDef;
-+ typedef StringDef *StringDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_StringDef_ThruPOA_Proxy_Impl;
-+ class _TAO_StringDef_Strategized_Proxy_Broker;
-
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ class StringDef : public virtual IDLType
-+ {
-+ protected:
-+ StringDef (void);
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -10792,7 +10671,7 @@
+ CORBA::SystemException
+ ));
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ public:
-+ StringDef (const StringDef& rhs);
-+ virtual ~StringDef (void);
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -10800,7 +10679,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -10809,7 +10688,7 @@
+ ));
-- void move (
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- CORBA::TypeCode_ptr type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -10827,7 +10706,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _non_existent_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- AliasDef_tie (const AliasDef_tie &);
-- void operator= (const AliasDef_tie &);
--};
-+ virtual void _dispatch (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -10861,7 +10740,7 @@
+ class _TAO_NativeDef_ThruPOA_Proxy_Impl;
+ class _TAO_NativeDef_Strategized_Proxy_Broker;
--#endif /* ACE_HAS_USING_KEYWORD */
-+ IR_StringDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--class NativeDef;
--typedef NativeDef *NativeDef_ptr;
--// Forward Classes Declaration
--class _TAO_NativeDef_ThruPOA_Proxy_Impl;
--class _TAO_NativeDef_Strategized_Proxy_Broker;
-+ virtual const char* _interface_repository_id (void) const;
-
--class NativeDef : public virtual TypedefDef
--{
--protected:
-- NativeDef (void);
-+ virtual CORBA::ULong bound (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
+-class TAO_IFR_Client_Export NativeDef : public virtual TypedefDef
++ class NativeDef : public virtual TypedefDef
+ {
+ protected:
+ NativeDef (void);
+@@ -10904,7 +10783,7 @@
+ TAO_default_environment ()
+ );
--public:
-- NativeDef (const NativeDef& rhs);
-- virtual ~NativeDef (void);
-+ static void _get_bound_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-+ virtual void bound (
-+ CORBA::ULong bound,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_bound_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+ static void _get_type_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _is_a_skel (
-- 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 ()
-- );
--
-- virtual void _dispatch (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
- ::IR::NativeDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual const char* _interface_repository_id (void) const;
--
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ IR_NativeDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -10915,7 +10794,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -10923,7 +10802,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -10931,7 +10810,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -10939,7 +10818,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -10947,7 +10826,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -10955,7 +10834,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -10963,7 +10842,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -10971,7 +10850,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -10979,7 +10858,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -10987,7 +10866,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_type_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -10995,7 +10874,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -11003,7 +10882,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -11011,7 +10890,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
--
--#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 */
--
--};
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -11019,11 +10898,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
+ TAO_default_environment ()
+ );
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -11033,20 +10911,19 @@
+
+ };
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Declaration
//
--class _TAO_NativeDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_NativeDef_Proxy_Broker
-+class _TAO_StringDef_Strategized_Proxy_Broker : public virtual _TAO_StringDef_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_NativeDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_NativeDef_Proxy_Broker
++class _TAO_NativeDef_Strategized_Proxy_Broker : public virtual _TAO_NativeDef_Proxy_Broker
{
public:
-- _TAO_NativeDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_NativeDef_Strategized_Proxy_Broker (void);
--
+ _TAO_NativeDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_NativeDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_NativeDef_Proxy_Impl &select_proxy (
- ::IR::NativeDef *object,
-+ _TAO_StringDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_StringDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_StringDef_Proxy_Impl &select_proxy (
-+ IR_StringDef *object,
++ virtual _TAO_NativeDef_Proxy_Impl &select_proxy (
++ IR_NativeDef *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -11064,7 +8464,7 @@
+@@ -11064,7 +10941,7 @@
// 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.
- ::IR::_TAO_NativeDef_Proxy_Impl
-+ _TAO_StringDef_Proxy_Impl
++ _TAO_NativeDef_Proxy_Impl
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -11073,10 +8473,9 @@
- // interface.
-
- public:
-- static _TAO_NativeDef_Strategized_Proxy_Broker *the_TAO_NativeDef_Strategized_Proxy_Broker (void);
-+ static _TAO_StringDef_Strategized_Proxy_Broker *the_TAO_StringDef_Strategized_Proxy_Broker (void);
+@@ -11076,7 +10953,6 @@
+ static _TAO_NativeDef_Strategized_Proxy_Broker *the_TAO_NativeDef_Strategized_Proxy_Broker (void);
};
-
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-@@ -11086,360 +8485,255 @@
+@@ -11086,8 +10962,8 @@
// ThruPOA Impl. Declaration
//
--class _TAO_NativeDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_NativeDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_NativeDef_Proxy_Impl,
-+class _TAO_StringDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_StringDef_Proxy_Impl,
++class _TAO_NativeDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_NativeDef_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl
-+ public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
+ public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl
+@@ -11104,11 +10980,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export NativeDef_tie : public NativeDef
++ class NativeDef_tie : public NativeDef
{
public:
-- _TAO_NativeDef_ThruPOA_Proxy_Impl (void);
-+ _TAO_StringDef_ThruPOA_Proxy_Impl (void);
+ NativeDef_tie (T &t);
+@@ -11136,7 +11011,7 @@
-- virtual ~_TAO_NativeDef_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_StringDef_ThruPOA_Proxy_Impl (void);
-
-- };
--
--
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
--
--
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class NativeDef_tie : public NativeDef
--{
--public:
-- NativeDef_tie (T &t);
-- // the T& ctor
-- NativeDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- NativeDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- NativeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~NativeDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- char * id (
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual CORBA::ULong bound (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+ char * id (
+@@ -11190,7 +11065,7 @@
CORBA::SystemException
));
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual void bound (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::ULong bound,
-+ CORBA::Environment &ACE_TRY_ENV
+- IR::Container_ptr defined_in (
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -11206,7 +11081,7 @@
CORBA::SystemException
));
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+};
-
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
-
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class StringDef_tie : public StringDef
-+ {
-+ public:
-+ StringDef_tie (T &t);
-+ // the T& ctor
-+ StringDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ StringDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ StringDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~StringDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ CORBA::ULong bound (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void bound (
-+ CORBA::ULong bound,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -11214,7 +11089,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void move (
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -11223,7 +11098,7 @@
+ ));
+
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -11241,7 +11116,7 @@
+ CORBA::SystemException
+ ));
-- CORBA::TypeCode_ptr type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- NativeDef_tie (const NativeDef_tie &);
-- void operator= (const NativeDef_tie &);
--};
-+ // copy and assignment are not allowed
-+ StringDef_tie (const StringDef_tie &);
-+ void operator= (const StringDef_tie &);
-+ };
-
- #endif /* ACE_HAS_USING_KEYWORD */
-
--class PrimitiveDef;
--typedef PrimitiveDef *PrimitiveDef_ptr;
--// Forward Classes Declaration
--class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl;
--class _TAO_PrimitiveDef_Strategized_Proxy_Broker;
--
--class PrimitiveDef : public virtual IDLType
--{
--protected:
-- PrimitiveDef (void);
--
--public:
-- PrimitiveDef (const PrimitiveDef& rhs);
-- virtual ~PrimitiveDef (void);
--
--
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual void* _downcast (
-- 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 ()
-- );
-+ class WstringDef;
-+ typedef WstringDef *WstringDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_WstringDef_ThruPOA_Proxy_Impl;
-+ class _TAO_WstringDef_Strategized_Proxy_Broker;
-
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class WstringDef : public virtual IDLType
-+ {
-+ protected:
-+ WstringDef (void);
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -11275,7 +11150,7 @@
+ class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl;
+ class _TAO_PrimitiveDef_Strategized_Proxy_Broker;
-- virtual void _dispatch (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ public:
-+ WstringDef (const WstringDef& rhs);
-+ virtual ~WstringDef (void);
+-class TAO_IFR_Client_Export PrimitiveDef : public virtual IDLType
++ class PrimitiveDef : public virtual IDLType
+ {
+ protected:
+ PrimitiveDef (void);
+@@ -11318,14 +11193,14 @@
+ TAO_default_environment ()
+ );
- ::IR::PrimitiveDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ IR_PrimitiveDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
-- virtual const char* _interface_repository_id (void) const;
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+ virtual const char* _interface_repository_id (void) const;
- virtual IR::PrimitiveKind kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
-
-- static void _get_kind_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_type_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ virtual IR_PrimitiveKind kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -11345,7 +11220,7 @@
+ 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 ()
-+ );
-
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -11353,7 +11228,7 @@
+ 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 ()
-+ );
-
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -11361,11 +11236,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_WstringDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-
--#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_ServerRequestInfo_IR_PrimitiveDef_kind_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::PrimitiveDef;
-- TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::PrimitiveDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual const char* _interface_repository_id (void) const;
-
-- virtual Dynamic::ParameterList * arguments (
-+ virtual CORBA::ULong bound (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-+
-+ static void _get_bound_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-+ );
-+
-+ virtual void bound (
-+ CORBA::ULong bound,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get (const TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get &);
--
-- private:
-- POA_IR::PrimitiveDef *_tao_impl;
-- void result (IR::PrimitiveKind result);
-- // update the result
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -11419,27 +11293,26 @@
+ POA_IR::PrimitiveDef *_tao_impl;
+ void result (IR::PrimitiveKind result);
+ // update the result
-IR::PrimitiveKind _result;
--};
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--#endif /* TAO_HAS_INTERCEPTORS */
-+ static void _set_bound_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ IR_PrimitiveKind _result;
+ };
--};
-+ static void _get_type_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
+ #endif /* TAO_HAS_INTERCEPTORS */
+ };
+
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Declaration
//
--class _TAO_PrimitiveDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_PrimitiveDef_Proxy_Broker
-+class _TAO_WstringDef_Strategized_Proxy_Broker : public virtual _TAO_WstringDef_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_PrimitiveDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_PrimitiveDef_Proxy_Broker
++class _TAO_PrimitiveDef_Strategized_Proxy_Broker : public virtual _TAO_PrimitiveDef_Proxy_Broker
{
public:
-- _TAO_PrimitiveDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_PrimitiveDef_Strategized_Proxy_Broker (void);
--
+ _TAO_PrimitiveDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_PrimitiveDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_PrimitiveDef_Proxy_Impl &select_proxy (
- ::IR::PrimitiveDef *object,
-+ _TAO_WstringDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_WstringDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_WstringDef_Proxy_Impl &select_proxy (
-+ IR_WstringDef *object,
++ virtual _TAO_PrimitiveDef_Proxy_Impl &select_proxy (
++ IR_PrimitiveDef *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -11457,7 +8751,7 @@
+@@ -11457,7 +11330,7 @@
// 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.
- ::IR::_TAO_PrimitiveDef_Proxy_Impl
-+ _TAO_WstringDef_Proxy_Impl
++ _TAO_PrimitiveDef_Proxy_Impl
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -11466,10 +8760,9 @@
- // interface.
-
- public:
-- static _TAO_PrimitiveDef_Strategized_Proxy_Broker *the_TAO_PrimitiveDef_Strategized_Proxy_Broker (void);
-+ static _TAO_WstringDef_Strategized_Proxy_Broker *the_TAO_WstringDef_Strategized_Proxy_Broker (void);
+@@ -11469,7 +11342,6 @@
+ static _TAO_PrimitiveDef_Strategized_Proxy_Broker *the_TAO_PrimitiveDef_Strategized_Proxy_Broker (void);
};
-
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-@@ -11479,19 +8772,28 @@
+@@ -11479,8 +11351,8 @@
// ThruPOA Impl. Declaration
//
--class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_PrimitiveDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_PrimitiveDef_Proxy_Impl,
-+class _TAO_WstringDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_WstringDef_Proxy_Impl,
++class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_PrimitiveDef_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl,
public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
- {
- public:
-- _TAO_PrimitiveDef_ThruPOA_Proxy_Impl (void);
-+ _TAO_WstringDef_ThruPOA_Proxy_Impl (void);
+@@ -11490,7 +11362,7 @@
-- virtual ~_TAO_PrimitiveDef_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_WstringDef_ThruPOA_Proxy_Impl (void);
+ virtual ~_TAO_PrimitiveDef_ThruPOA_Proxy_Impl (void) { }
- virtual IR::PrimitiveKind kind (
-+ virtual CORBA::ULong bound (
++ virtual IR_PrimitiveKind kind (
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
)
- ACE_THROW_SPEC ((
-@@ -11505,323 +8807,253 @@
+@@ -11505,11 +11377,10 @@
// ThruPOA Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-
#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class PrimitiveDef_tie : public PrimitiveDef
--{
--public:
-- PrimitiveDef_tie (T &t);
-- // the T& ctor
-- PrimitiveDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- PrimitiveDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- PrimitiveDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~PrimitiveDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export PrimitiveDef_tie : public PrimitiveDef
++ class PrimitiveDef_tie : public PrimitiveDef
+ {
+ public:
+ PrimitiveDef_tie (T &t);
+@@ -11537,10 +11408,10 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
- IR::PrimitiveKind kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class WstringDef_tie : public WstringDef
-+ {
-+ public:
-+ WstringDef_tie (T &t);
-+ // the T& ctor
-+ WstringDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ WstringDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ WstringDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~WstringDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ CORBA::ULong bound (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- CORBA::TypeCode_ptr type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void bound (
-+ CORBA::ULong bound,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_PrimitiveKind kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -11556,7 +11427,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
- private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- PrimitiveDef_tie (const PrimitiveDef_tie &);
-- void operator= (const PrimitiveDef_tie &);
--};
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-
--#endif /* ACE_HAS_USING_KEYWORD */
-+ // copy and assignment are not allowed
-+ WstringDef_tie (const WstringDef_tie &);
-+ void operator= (const WstringDef_tie &);
-+ };
-
--class StringDef;
--typedef StringDef *StringDef_ptr;
--// Forward Classes Declaration
--class _TAO_StringDef_ThruPOA_Proxy_Impl;
--class _TAO_StringDef_Strategized_Proxy_Broker;
-+#endif /* ACE_HAS_USING_KEYWORD */
-
--class StringDef : public virtual IDLType
--{
--protected:
-- StringDef (void);
-+ class FixedDef;
-+ typedef FixedDef *FixedDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_FixedDef_ThruPOA_Proxy_Impl;
-+ class _TAO_FixedDef_Strategized_Proxy_Broker;
-
--public:
-- StringDef (const StringDef& rhs);
-- virtual ~StringDef (void);
-+ class FixedDef : public virtual IDLType
-+ {
-+ protected:
-+ FixedDef (void);
-
-+ public:
-+ FixedDef (const FixedDef& rhs);
-+ virtual ~FixedDef (void);
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -11590,7 +11461,7 @@
+ class _TAO_StringDef_ThruPOA_Proxy_Impl;
+ class _TAO_StringDef_Strategized_Proxy_Broker;
-- virtual void* _downcast (
-- 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 ()
-- );
--
-- static void _non_existent_skel (
-- 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 ()
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+-class TAO_IFR_Client_Export StringDef : public virtual IDLType
++ class StringDef : public virtual IDLType
+ {
+ protected:
+ StringDef (void);
+@@ -11633,7 +11504,7 @@
+ TAO_default_environment ()
+ );
- ::IR::StringDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
-
-- virtual const char* _interface_repository_id (void) const;
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual CORBA::ULong bound (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _non_existent_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_bound_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_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 ()
-+ );
-
-- virtual void bound (
-- CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ IR_FixedDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_bound_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual const char* _interface_repository_id (void) const;
-
-- static void _get_type_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::UShort digits (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_digits_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ IR_StringDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -11677,7 +11548,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void digits (
-+ CORBA::UShort digits,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
--
--#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_ServerRequestInfo_IR_StringDef_bound_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::StringDef;
-- TAO_ServerRequestInfo_IR_StringDef_bound_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::StringDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_digits_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual Dynamic::ParameterList * arguments (
-+ virtual CORBA::Short scale (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-+
-+ static void _get_scale_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-+ );
-+
-+ virtual void scale (
-+ CORBA::Short scale,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_StringDef_bound_get (const TAO_ServerRequestInfo_IR_StringDef_bound_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_StringDef_bound_get &);
--
-- private:
-- POA_IR::StringDef *_tao_impl;
-- void result (CORBA::ULong result);
-- // update the result
--CORBA::ULong _result;
--};
--
--class TAO_ServerRequestInfo_IR_StringDef_bound_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::StringDef;
-- TAO_ServerRequestInfo_IR_StringDef_bound_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::StringDef *tao_impl
-- ,
-- const CORBA::ULong & bound,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- 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 (
+@@ -11685,7 +11556,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_StringDef_bound_set (const TAO_ServerRequestInfo_IR_StringDef_bound_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_StringDef_bound_set &);
--
--private:
-- POA_IR::StringDef *_tao_impl;
-- const CORBA::ULong & bound_;
--};
-+ static void _set_scale_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--#endif /* TAO_HAS_INTERCEPTORS */
-+ static void _get_type_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--};
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -11693,11 +11564,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
+ TAO_default_environment ()
+ );
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -11808,20 +11678,19 @@
+
+ };
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Declaration
//
--class _TAO_StringDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_StringDef_Proxy_Broker
-+class _TAO_FixedDef_Strategized_Proxy_Broker : public virtual _TAO_FixedDef_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_StringDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_StringDef_Proxy_Broker
++class _TAO_StringDef_Strategized_Proxy_Broker : public virtual _TAO_StringDef_Proxy_Broker
{
public:
-- _TAO_StringDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_StringDef_Strategized_Proxy_Broker (void);
--
+ _TAO_StringDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_StringDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_StringDef_Proxy_Impl &select_proxy (
- ::IR::StringDef *object,
-+ _TAO_FixedDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_FixedDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_FixedDef_Proxy_Impl &select_proxy (
-+ IR_FixedDef *object,
++ virtual _TAO_StringDef_Proxy_Impl &select_proxy (
++ IR_StringDef *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -11839,7 +9071,7 @@
+@@ -11839,7 +11708,7 @@
// 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.
- ::IR::_TAO_StringDef_Proxy_Impl
-+ _TAO_FixedDef_Proxy_Impl
++ _TAO_StringDef_Proxy_Impl
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -11848,10 +9080,9 @@
- // interface.
-
- public:
-- static _TAO_StringDef_Strategized_Proxy_Broker *the_TAO_StringDef_Strategized_Proxy_Broker (void);
-+ static _TAO_FixedDef_Strategized_Proxy_Broker *the_TAO_FixedDef_Strategized_Proxy_Broker (void);
+@@ -11851,7 +11720,6 @@
+ static _TAO_StringDef_Strategized_Proxy_Broker *the_TAO_StringDef_Strategized_Proxy_Broker (void);
};
-
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-@@ -11861,367 +9092,338 @@
+@@ -11861,8 +11729,8 @@
// ThruPOA Impl. Declaration
//
--class _TAO_StringDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_StringDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_StringDef_Proxy_Impl,
-+class _TAO_FixedDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_FixedDef_Proxy_Impl,
++class _TAO_StringDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_StringDef_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl,
public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
+@@ -11896,11 +11764,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export StringDef_tie : public StringDef
++ class StringDef_tie : public StringDef
{
public:
-- _TAO_StringDef_ThruPOA_Proxy_Impl (void);
-+ _TAO_FixedDef_ThruPOA_Proxy_Impl (void);
-
-- virtual ~_TAO_StringDef_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_FixedDef_ThruPOA_Proxy_Impl (void);
+ StringDef_tie (T &t);
+@@ -11928,7 +11795,7 @@
-- virtual CORBA::ULong bound (
-+ virtual CORBA::UShort digits (
- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-- virtual void bound (
-+ virtual void digits (
- CORBA_Object *_collocated_tao_target_,
-- CORBA::ULong bound,
-+ CORBA::UShort digits,
- CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
--};
--
--
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
--
--
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class StringDef_tie : public StringDef
--{
--public:
-- StringDef_tie (T &t);
-- // the T& ctor
-- StringDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- StringDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- StringDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~StringDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- CORBA::ULong bound (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void bound (
-- CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- CORBA::TypeCode_ptr type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- IR::DefinitionKind def_kind (
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual CORBA::Short scale (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+ CORBA::ULong bound (
+@@ -11956,7 +11823,7 @@
CORBA::SystemException
));
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual void scale (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Short scale,
-+ CORBA::Environment &ACE_TRY_ENV
+- IR::DefinitionKind def_kind (
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
+@@ -11990,7 +11857,7 @@
+ class _TAO_WstringDef_ThruPOA_Proxy_Impl;
+ class _TAO_WstringDef_Strategized_Proxy_Broker;
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- StringDef_tie (const StringDef_tie &);
-- void operator= (const StringDef_tie &);
- };
-
--#endif /* ACE_HAS_USING_KEYWORD */
--
--class WstringDef;
--typedef WstringDef *WstringDef_ptr;
--// Forward Classes Declaration
--class _TAO_WstringDef_ThruPOA_Proxy_Impl;
--class _TAO_WstringDef_Strategized_Proxy_Broker;
--
--class WstringDef : public virtual IDLType
--{
--protected:
-- WstringDef (void);
-
--public:
-- WstringDef (const WstringDef& rhs);
-- virtual ~WstringDef (void);
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
-
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class FixedDef_tie : public FixedDef
-+ {
-+ public:
-+ FixedDef_tie (T &t);
-+ // the T& ctor
-+ FixedDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ FixedDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ FixedDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~FixedDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ CORBA::UShort digits (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void digits (
-+ CORBA::UShort digits,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+ CORBA::Short scale (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void scale (
-+ CORBA::Short scale,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void _dispatch (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+-class TAO_IFR_Client_Export WstringDef : public virtual IDLType
++ class WstringDef : public virtual IDLType
+ {
+ protected:
+ WstringDef (void);
+@@ -12033,7 +11900,7 @@
+ TAO_default_environment ()
+ );
- ::IR::WstringDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual const char* _interface_repository_id (void) const;
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-
-- virtual CORBA::ULong bound (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ // copy and assignment are not allowed
-+ FixedDef_tie (const FixedDef_tie &);
-+ void operator= (const FixedDef_tie &);
-+ };
-
-- static void _get_bound_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+#endif /* ACE_HAS_USING_KEYWORD */
-
-- virtual void bound (
-- CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ class SequenceDef;
-+ typedef SequenceDef *SequenceDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
-+ class _TAO_SequenceDef_Strategized_Proxy_Broker;
-
-- static void _set_bound_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class SequenceDef : public virtual IDLType
-+ {
-+ protected:
-+ SequenceDef (void);
-
-- static void _get_type_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ IR_WstringDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -12077,7 +11944,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ public:
-+ SequenceDef (const SequenceDef& rhs);
-+ virtual ~SequenceDef (void);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -12085,7 +11952,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -12093,11 +11960,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-
--#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_ServerRequestInfo_IR_WstringDef_bound_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::WstringDef;
-- TAO_ServerRequestInfo_IR_WstringDef_bound_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::WstringDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void* _downcast (
-+ 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 ()
-+ );
-+
-+ static void _non_existent_skel (
-+ 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 ()
-+ );
-+
-+ IR_SequenceDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-+
-+ virtual const char* _interface_repository_id (void) const;
-
-- virtual Dynamic::ParameterList * arguments (
-+ virtual CORBA::ULong bound (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-+
-+ static void _get_bound_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-+
-+ virtual void bound (
-+ CORBA::ULong bound,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-+
-+ static void _set_bound_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-+
-+ virtual CORBA::TypeCode_ptr element_type (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_WstringDef_bound_get (const TAO_ServerRequestInfo_IR_WstringDef_bound_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_WstringDef_bound_get &);
--
-- private:
-- POA_IR::WstringDef *_tao_impl;
-- void result (CORBA::ULong result);
-- // update the result
--CORBA::ULong _result;
--};
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -12208,20 +12074,19 @@
--class TAO_ServerRequestInfo_IR_WstringDef_bound_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::WstringDef;
-- TAO_ServerRequestInfo_IR_WstringDef_bound_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::WstringDef *tao_impl
-- ,
-- const CORBA::ULong & bound,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_element_type_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_WstringDef_bound_set (const TAO_ServerRequestInfo_IR_WstringDef_bound_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_WstringDef_bound_set &);
--
--private:
-- POA_IR::WstringDef *_tao_impl;
-- const CORBA::ULong & bound_;
--};
-+ virtual IR_IDLType_ptr element_type_def (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--#endif /* TAO_HAS_INTERCEPTORS */
-+ static void _get_element_type_def_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--};
-+ virtual void element_type_def (
-+ IR_IDLType_ptr element_type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-+
-+ static void _set_element_type_def_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_type_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
+ };
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Declaration
//
--class _TAO_WstringDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_WstringDef_Proxy_Broker
-+class _TAO_SequenceDef_Strategized_Proxy_Broker : public virtual _TAO_SequenceDef_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_WstringDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_WstringDef_Proxy_Broker
++class _TAO_WstringDef_Strategized_Proxy_Broker : public virtual _TAO_WstringDef_Proxy_Broker
{
public:
-- _TAO_WstringDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_WstringDef_Strategized_Proxy_Broker (void);
--
+ _TAO_WstringDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_WstringDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_WstringDef_Proxy_Impl &select_proxy (
- ::IR::WstringDef *object,
-+ _TAO_SequenceDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_SequenceDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_SequenceDef_Proxy_Impl &select_proxy (
-+ IR_SequenceDef *object,
++ virtual _TAO_WstringDef_Proxy_Impl &select_proxy (
++ IR_WstringDef *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -12239,7 +9441,7 @@
+@@ -12239,7 +12104,7 @@
// 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.
- ::IR::_TAO_WstringDef_Proxy_Impl
-+ _TAO_SequenceDef_Proxy_Impl
++ _TAO_WstringDef_Proxy_Impl
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -12248,10 +9450,9 @@
- // interface.
-
- public:
-- static _TAO_WstringDef_Strategized_Proxy_Broker *the_TAO_WstringDef_Strategized_Proxy_Broker (void);
-+ static _TAO_SequenceDef_Strategized_Proxy_Broker *the_TAO_SequenceDef_Strategized_Proxy_Broker (void);
+@@ -12251,7 +12116,6 @@
+ static _TAO_WstringDef_Strategized_Proxy_Broker *the_TAO_WstringDef_Strategized_Proxy_Broker (void);
};
-
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-@@ -12261,26 +9462,26 @@
+@@ -12261,8 +12125,8 @@
// ThruPOA Impl. Declaration
//
--class _TAO_WstringDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_WstringDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_WstringDef_Proxy_Impl,
-+class _TAO_SequenceDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_SequenceDef_Proxy_Impl,
++class _TAO_WstringDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_WstringDef_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl,
public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
+@@ -12296,11 +12160,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export WstringDef_tie : public WstringDef
++ class WstringDef_tie : public WstringDef
{
public:
-- _TAO_WstringDef_ThruPOA_Proxy_Impl (void);
-+ _TAO_SequenceDef_ThruPOA_Proxy_Impl (void);
-
-- virtual ~_TAO_WstringDef_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_SequenceDef_ThruPOA_Proxy_Impl (void);
+ WstringDef_tie (T &t);
+@@ -12328,7 +12191,7 @@
-- 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
- ));
-
-- virtual void bound (
-+ virtual void bound (
- CORBA_Object *_collocated_tao_target_,
- CORBA::ULong bound,
- CORBA::Environment &ACE_TRY_ENV
-@@ -12289,473 +9490,326 @@
- CORBA::SystemException
- ));
-
--};
--
--
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
--
--
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class WstringDef_tie : public WstringDef
--{
--public:
-- WstringDef_tie (T &t);
-- // the T& ctor
-- WstringDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- WstringDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- WstringDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~WstringDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- CORBA::ULong bound (
-- 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
- ));
-
-- void bound (
-- CORBA::ULong bound,
-- 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
- ));
-
-- CORBA::TypeCode_ptr type (
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_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::Environment &env =
+ TAO_default_environment ()
+ );
+ CORBA::ULong bound (
+@@ -12356,7 +12219,7 @@
CORBA::SystemException
));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+};
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- WstringDef_tie (const WstringDef_tie &);
-- void operator= (const WstringDef_tie &);
--};
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
-
--#endif /* ACE_HAS_USING_KEYWORD */
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class SequenceDef_tie : public SequenceDef
-+ {
-+ public:
-+ SequenceDef_tie (T &t);
-+ // the T& ctor
-+ SequenceDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ SequenceDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ SequenceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~SequenceDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ CORBA::ULong bound (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class FixedDef;
--typedef FixedDef *FixedDef_ptr;
--// Forward Classes Declaration
--class _TAO_FixedDef_ThruPOA_Proxy_Impl;
--class _TAO_FixedDef_Strategized_Proxy_Broker;
-+ void bound (
-+ CORBA::ULong bound,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class FixedDef : public virtual IDLType
--{
--protected:
-- FixedDef (void);
-+ CORBA::TypeCode_ptr element_type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--public:
-- FixedDef (const FixedDef& rhs);
-- virtual ~FixedDef (void);
-+ IR_IDLType_ptr element_type_def (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-+ void element_type_def (
-+ IR_IDLType_ptr element_type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-
-- virtual void _dispatch (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ // copy and assignment are not allowed
-+ SequenceDef_tie (const SequenceDef_tie &);
-+ void operator= (const SequenceDef_tie &);
-+ };
-
-- ::IR::FixedDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+#endif /* ACE_HAS_USING_KEYWORD */
-
-- virtual const char* _interface_repository_id (void) const;
-+ class ArrayDef;
-+ typedef ArrayDef *ArrayDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
-+ class _TAO_ArrayDef_Strategized_Proxy_Broker;
-
-- virtual CORBA::UShort digits (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ class ArrayDef : public virtual IDLType
-+ {
-+ protected:
-+ ArrayDef (void);
-
-- static void _get_digits_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ public:
-+ ArrayDef (const ArrayDef& rhs);
-+ virtual ~ArrayDef (void);
-
-- virtual void digits (
-- CORBA::UShort digits,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-
-- static void _set_digits_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -12390,7 +12253,7 @@
+ class _TAO_FixedDef_ThruPOA_Proxy_Impl;
+ class _TAO_FixedDef_Strategized_Proxy_Broker;
-- virtual CORBA::Short scale (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
-
-- static void _get_scale_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual void scale (
-- CORBA::Short scale,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _non_existent_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_scale_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_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 ()
-+ );
-
-- static void _get_type_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_ArrayDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+-class TAO_IFR_Client_Export FixedDef : public virtual IDLType
++ class FixedDef : public virtual IDLType
+ {
+ protected:
+ FixedDef (void);
+@@ -12433,7 +12296,7 @@
+ TAO_default_environment ()
+ );
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+- ::IR::FixedDef *_this (
++ IR_FixedDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -12510,7 +12373,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual const char* _interface_repository_id (void) const;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -12518,7 +12381,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::ULong length (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--
--#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_ServerRequestInfo_IR_FixedDef_digits_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::FixedDef;
-- TAO_ServerRequestInfo_IR_FixedDef_digits_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::FixedDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_length_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual Dynamic::ParameterList * arguments (
-+ virtual void length (
-+ CORBA::ULong length,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-+
-+ static void _set_length_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-+
-+ virtual CORBA::TypeCode_ptr element_type (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-+
-+ static void _get_element_type_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-+
-+ virtual IR_IDLType_ptr element_type_def (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_FixedDef_digits_get (const TAO_ServerRequestInfo_IR_FixedDef_digits_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_FixedDef_digits_get &);
--
-- private:
-- POA_IR::FixedDef *_tao_impl;
-- void result (CORBA::UShort result);
-- // update the result
--CORBA::UShort _result;
--};
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
--class TAO_ServerRequestInfo_IR_FixedDef_digits_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::FixedDef;
-- TAO_ServerRequestInfo_IR_FixedDef_digits_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::FixedDef *tao_impl
-- ,
-- const CORBA::UShort & digits,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_element_type_def_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ 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 (
+@@ -12526,11 +12389,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_FixedDef_digits_set (const TAO_ServerRequestInfo_IR_FixedDef_digits_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_FixedDef_digits_set &);
--
--private:
-- POA_IR::FixedDef *_tao_impl;
-- const CORBA::UShort & digits_;
--};
--
--class TAO_ServerRequestInfo_IR_FixedDef_scale_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::FixedDef;
-- TAO_ServerRequestInfo_IR_FixedDef_scale_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::FixedDef *tao_impl
-- ,
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_FixedDef_scale_get (const TAO_ServerRequestInfo_IR_FixedDef_scale_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_FixedDef_scale_get &);
--
--private:
-- POA_IR::FixedDef *_tao_impl;
-- void result (CORBA::Short result);
-- // update the result
--CORBA::Short _result;
--};
--
--class TAO_ServerRequestInfo_IR_FixedDef_scale_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::FixedDef;
-- TAO_ServerRequestInfo_IR_FixedDef_scale_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::FixedDef *tao_impl
-- ,
-- const CORBA::Short & scale,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void element_type_def (
-+ IR_IDLType_ptr element_type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ CORBA::Environment &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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_FixedDef_scale_set (const TAO_ServerRequestInfo_IR_FixedDef_scale_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_FixedDef_scale_set &);
--
--private:
-- POA_IR::FixedDef *_tao_impl;
-- const CORBA::Short & scale_;
--};
-+ static void _set_element_type_def_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--#endif /* TAO_HAS_INTERCEPTORS */
-+ static void _get_type_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--};
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -12742,20 +12604,19 @@
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
+ };
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Declaration
//
--class _TAO_FixedDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_FixedDef_Proxy_Broker
-+class _TAO_ArrayDef_Strategized_Proxy_Broker : public virtual _TAO_ArrayDef_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_FixedDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_FixedDef_Proxy_Broker
++class _TAO_FixedDef_Strategized_Proxy_Broker : public virtual _TAO_FixedDef_Proxy_Broker
{
public:
-- _TAO_FixedDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_FixedDef_Strategized_Proxy_Broker (void);
--
+ _TAO_FixedDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_FixedDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_FixedDef_Proxy_Impl &select_proxy (
- ::IR::FixedDef *object,
-+ _TAO_ArrayDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_ArrayDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_ArrayDef_Proxy_Impl &select_proxy (
-+ IR_ArrayDef *object,
++ virtual _TAO_FixedDef_Proxy_Impl &select_proxy (
++ IR_FixedDef *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -12773,7 +9827,7 @@
+@@ -12773,7 +12634,7 @@
// 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.
- ::IR::_TAO_FixedDef_Proxy_Impl
-+ _TAO_ArrayDef_Proxy_Impl
++ _TAO_FixedDef_Proxy_Impl
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -12782,10 +9836,9 @@
- // interface.
-
- public:
-- static _TAO_FixedDef_Strategized_Proxy_Broker *the_TAO_FixedDef_Strategized_Proxy_Broker (void);
-+ static _TAO_ArrayDef_Strategized_Proxy_Broker *the_TAO_ArrayDef_Strategized_Proxy_Broker (void);
+@@ -12785,7 +12646,6 @@
+ static _TAO_FixedDef_Strategized_Proxy_Broker *the_TAO_FixedDef_Strategized_Proxy_Broker (void);
};
-
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-@@ -12795,45 +9848,53 @@
+@@ -12795,8 +12655,8 @@
// ThruPOA Impl. Declaration
//
--class _TAO_FixedDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_FixedDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_FixedDef_Proxy_Impl,
-+class _TAO_ArrayDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_ArrayDef_Proxy_Impl,
++class _TAO_FixedDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_FixedDef_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl,
public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
- {
- public:
-- _TAO_FixedDef_ThruPOA_Proxy_Impl (void);
-+ _TAO_ArrayDef_ThruPOA_Proxy_Impl (void);
-
-- virtual ~_TAO_FixedDef_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_ArrayDef_ThruPOA_Proxy_Impl (void);
-
-- virtual CORBA::UShort digits (
-+ virtual CORBA::ULong length (
- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-- virtual void digits (
-+ virtual void length (
- CORBA_Object *_collocated_tao_target_,
-- CORBA::UShort digits,
-+ CORBA::ULong length,
- CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-- virtual CORBA::Short scale (
-+ 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 void scale (
-+ virtual IR_IDLType_ptr element_type_def (
- CORBA_Object *_collocated_tao_target_,
-- CORBA::Short scale,
-+ 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
- )
- ACE_THROW_SPEC ((
-@@ -12847,550 +9908,461 @@
+@@ -12847,11 +12707,10 @@
// ThruPOA Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-
#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class FixedDef_tie : public FixedDef
--{
--public:
-- FixedDef_tie (T &t);
-- // the T& ctor
-- FixedDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- FixedDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- FixedDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~FixedDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- CORBA::UShort digits (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class ArrayDef_tie : public ArrayDef
-+ {
-+ public:
-+ ArrayDef_tie (T &t);
-+ // the T& ctor
-+ ArrayDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ ArrayDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ ArrayDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~ArrayDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ CORBA::ULong length (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void digits (
-- CORBA::UShort digits,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void length (
-+ CORBA::ULong length,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- CORBA::Short scale (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ CORBA::TypeCode_ptr element_type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void scale (
-- CORBA::Short scale,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_IDLType_ptr element_type_def (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- CORBA::TypeCode_ptr type (
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export FixedDef_tie : public FixedDef
++ class FixedDef_tie : public FixedDef
+ {
+ public:
+ FixedDef_tie (T &t);
+@@ -12879,7 +12738,7 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void element_type_def (
-+ IR_IDLType_ptr element_type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+ CORBA::UShort digits (
+@@ -12924,7 +12783,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
- private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- FixedDef_tie (const FixedDef_tie &);
-- void operator= (const FixedDef_tie &);
--};
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-+
-+ // copy and assignment are not allowed
-+ ArrayDef_tie (const ArrayDef_tie &);
-+ void operator= (const ArrayDef_tie &);
-+ };
-
- #endif /* ACE_HAS_USING_KEYWORD */
-
--class SequenceDef;
--typedef SequenceDef *SequenceDef_ptr;
--// Forward Classes Declaration
--class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
--class _TAO_SequenceDef_Strategized_Proxy_Broker;
-+ class ExceptionDef;
-+ typedef ExceptionDef *ExceptionDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
-+ class _TAO_ExceptionDef_Strategized_Proxy_Broker;
-
--class SequenceDef : public virtual IDLType
--{
--protected:
-- SequenceDef (void);
-+ class ExceptionDef : public virtual Contained, public virtual Container
-+ {
-+ protected:
-+ ExceptionDef (void);
-
--public:
-- SequenceDef (const SequenceDef& rhs);
-- virtual ~SequenceDef (void);
-+ public:
-+ ExceptionDef (const ExceptionDef& rhs);
-+ virtual ~ExceptionDef (void);
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -12958,7 +12817,7 @@
+ class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
+ class _TAO_SequenceDef_Strategized_Proxy_Broker;
+-class TAO_IFR_Client_Export SequenceDef : public virtual IDLType
++ class SequenceDef : public virtual IDLType
+ {
+ protected:
+ SequenceDef (void);
+@@ -13001,7 +12860,7 @@
+ TAO_default_environment ()
+ );
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+ virtual void* _downcast (
-+ 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 ()
-- );
-+ static void _is_a_skel (
-+ 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 ()
-- );
-+ static void _non_existent_skel (
-+ 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 ()
-- );
--
- ::IR::SequenceDef *_this (
-- 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 ()
-+ );
-
-- virtual const char* _interface_repository_id (void) const;
-+ IR_ExceptionDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual CORBA::ULong bound (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual const char* _interface_repository_id (void) const;
-
-- static void _get_bound_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- virtual void bound (
-- CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _get_type_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_bound_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_StructMemberSeq * members (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- virtual CORBA::TypeCode_ptr element_type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _get_members_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_element_type_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void members (
-+ const IR_StructMemberSeq & members,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ IR_SequenceDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -13057,7 +12916,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::IDLType_ptr element_type_def (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _set_members_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_element_type_def_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ virtual IR_IDLType_ptr element_type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -13074,7 +12933,7 @@
+ );
-- virtual void element_type_def (
+ virtual void element_type_def (
- IR::IDLType_ptr element_type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_element_type_def_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_type_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -13094,7 +12953,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--
--#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_ServerRequestInfo_IR_SequenceDef_bound_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::SequenceDef;
-- TAO_ServerRequestInfo_IR_SequenceDef_bound_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::SequenceDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- virtual Dynamic::ParameterList * arguments (
-- CORBA::Environment &ACE_TRY_ENV =
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
-- CORBA::Environment &ACE_TRY_ENV =
-+ );
-+
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-- CORBA::Environment &ACE_TRY_ENV =
-+ );
-+
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_SequenceDef_bound_get (const TAO_ServerRequestInfo_IR_SequenceDef_bound_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_SequenceDef_bound_get &);
--
-- private:
-- POA_IR::SequenceDef *_tao_impl;
-- void result (CORBA::ULong result);
-- // update the result
--CORBA::ULong _result;
--};
-+ );
+ TAO_default_environment ()
+ );
--class TAO_ServerRequestInfo_IR_SequenceDef_bound_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::SequenceDef;
-- TAO_ServerRequestInfo_IR_SequenceDef_bound_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::SequenceDef *tao_impl
-- ,
-- const CORBA::ULong & bound,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &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 (
+@@ -13102,7 +12961,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_SequenceDef_bound_set (const TAO_ServerRequestInfo_IR_SequenceDef_bound_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_SequenceDef_bound_set &);
--
--private:
-- POA_IR::SequenceDef *_tao_impl;
-- const CORBA::ULong & bound_;
--};
-+ static void lookup_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
--class TAO_ServerRequestInfo_IR_SequenceDef_element_type_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::SequenceDef;
-- TAO_ServerRequestInfo_IR_SequenceDef_element_type_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::SequenceDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void contents_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- virtual Dynamic::ParameterList * arguments (
+@@ -13110,11 +12969,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_SequenceDef_element_type_get (const TAO_ServerRequestInfo_IR_SequenceDef_element_type_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_SequenceDef_element_type_get &);
--
--private:
-- POA_IR::SequenceDef *_tao_impl;
-- void result (CORBA::TypeCode_ptr result);
-- // update the result
--CORBA::TypeCode_ptr _result;
--};
-+ static void lookup_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
--class TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::SequenceDef;
-- TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::SequenceDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void describe_contents_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get (const TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get &);
--
--private:
-- POA_IR::SequenceDef *_tao_impl;
-- void result (IR::IDLType_ptr result);
-- // update the result
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -13320,7 +13178,7 @@
+ POA_IR::SequenceDef *_tao_impl;
+ void result (IR::IDLType_ptr result);
+ // update the result
-IR::IDLType_ptr _result;
--};
-+ static void create_module_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_IDLType_ptr _result;
+ };
--class TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::SequenceDef;
-- TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::SequenceDef *tao_impl
-- ,
+ class TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set : public TAO_ServerRequestInfo
+@@ -13331,7 +13189,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::SequenceDef *tao_impl
+ ,
- IR::IDLType_ptr element_type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_constant_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set (const TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set &);
--
--private:
-- POA_IR::SequenceDef *_tao_impl;
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -13370,27 +13228,26 @@
+
+ private:
+ POA_IR::SequenceDef *_tao_impl;
- IR::IDLType_ptr element_type_def_;
--};
-+ static void create_struct_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_IDLType_ptr element_type_def_;
+ };
--#endif /* TAO_HAS_INTERCEPTORS */
-+ static void create_union_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ #endif /* TAO_HAS_INTERCEPTORS */
--};
-+ static void create_enum_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_alias_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_interface_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_value_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_value_box_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_exception_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_native_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
+ };
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Declaration
//
--class _TAO_SequenceDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_SequenceDef_Proxy_Broker
-+class _TAO_ExceptionDef_Strategized_Proxy_Broker : public virtual _TAO_ExceptionDef_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_SequenceDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_SequenceDef_Proxy_Broker
++class _TAO_SequenceDef_Strategized_Proxy_Broker : public virtual _TAO_SequenceDef_Proxy_Broker
{
public:
-- _TAO_SequenceDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_SequenceDef_Strategized_Proxy_Broker (void);
--
+ _TAO_SequenceDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_SequenceDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_SequenceDef_Proxy_Impl &select_proxy (
- ::IR::SequenceDef *object,
-+ _TAO_ExceptionDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_ExceptionDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_ExceptionDef_Proxy_Impl &select_proxy (
-+ IR_ExceptionDef *object,
++ virtual _TAO_SequenceDef_Proxy_Impl &select_proxy (
++ IR_SequenceDef *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -13408,7 +10380,7 @@
+@@ -13408,7 +13265,7 @@
// 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.
- ::IR::_TAO_SequenceDef_Proxy_Impl
-+ _TAO_ExceptionDef_Proxy_Impl
++ _TAO_SequenceDef_Proxy_Impl
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -13417,10 +10389,9 @@
- // interface.
-
- public:
-- static _TAO_SequenceDef_Strategized_Proxy_Broker *the_TAO_SequenceDef_Strategized_Proxy_Broker (void);
-+ static _TAO_ExceptionDef_Strategized_Proxy_Broker *the_TAO_ExceptionDef_Strategized_Proxy_Broker (void);
+@@ -13420,7 +13277,6 @@
+ static _TAO_SequenceDef_Strategized_Proxy_Broker *the_TAO_SequenceDef_Strategized_Proxy_Broker (void);
};
-
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-@@ -13430,53 +10401,37 @@
+@@ -13430,8 +13286,8 @@
// ThruPOA Impl. Declaration
//
--class _TAO_SequenceDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_SequenceDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_SequenceDef_Proxy_Impl,
-+class _TAO_ExceptionDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_ExceptionDef_Proxy_Impl,
++class _TAO_SequenceDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_SequenceDef_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
-+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl
-
- {
- public:
-- _TAO_SequenceDef_ThruPOA_Proxy_Impl (void);
-+ _TAO_ExceptionDef_ThruPOA_Proxy_Impl (void);
-
-- virtual ~_TAO_SequenceDef_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_ExceptionDef_ThruPOA_Proxy_Impl (void);
+ public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
-- 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
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- virtual CORBA::TypeCode_ptr element_type (
-+ virtual CORBA::TypeCode_ptr type (
- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
+@@ -13466,7 +13322,7 @@
CORBA::SystemException
));
- virtual IR::IDLType_ptr element_type_def (
-+ virtual IR_StructMemberSeq * members (
++ virtual IR_IDLType_ptr element_type_def (
CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
+@@ -13476,7 +13332,7 @@
-- virtual void element_type_def (
-+ virtual void members (
+ virtual void element_type_def (
CORBA_Object *_collocated_tao_target_,
- IR::IDLType_ptr element_type_def,
-+ const IR_StructMemberSeq & members,
++ IR_IDLType_ptr element_type_def,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -13490,2241 +10445,2139 @@
+@@ -13490,11 +13346,10 @@
// ThruPOA Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-
#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class SequenceDef_tie : public SequenceDef
--{
--public:
-- SequenceDef_tie (T &t);
-- // the T& ctor
-- SequenceDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- SequenceDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- SequenceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~SequenceDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- CORBA::ULong bound (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void bound (
-- CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- CORBA::TypeCode_ptr element_type (
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export SequenceDef_tie : public SequenceDef
++ class SequenceDef_tie : public SequenceDef
+ {
+ public:
+ SequenceDef_tie (T &t);
+@@ -13522,7 +13377,7 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class ExceptionDef_tie : public ExceptionDef
-+ {
-+ public:
-+ ExceptionDef_tie (T &t);
-+ // the T& ctor
-+ ExceptionDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ ExceptionDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ ExceptionDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~ExceptionDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+ CORBA::ULong bound (
+@@ -13550,7 +13405,7 @@
+ CORBA::SystemException
+ ));
- IR::IDLType_ptr element_type_def (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_StructMemberSeq * members (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void element_type_def (
++ IR_IDLType_ptr element_type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -13559,7 +13414,7 @@
+ ));
+
+ void element_type_def (
- IR::IDLType_ptr element_type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void members (
-+ const IR_StructMemberSeq & members,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- CORBA::TypeCode_ptr type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -13575,7 +13430,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- SequenceDef_tie (const SequenceDef_tie &);
-- void operator= (const SequenceDef_tie &);
--};
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -13609,7 +13464,7 @@
+ class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
+ class _TAO_ArrayDef_Strategized_Proxy_Broker;
--#endif /* ACE_HAS_USING_KEYWORD */
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class ArrayDef;
--typedef ArrayDef *ArrayDef_ptr;
--// Forward Classes Declaration
--class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
--class _TAO_ArrayDef_Strategized_Proxy_Broker;
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class ArrayDef : public virtual IDLType
--{
--protected:
-- ArrayDef (void);
--
--public:
-- ArrayDef (const ArrayDef& rhs);
-- virtual ~ArrayDef (void);
--
--
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual void* _downcast (
-- 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 ()
-- );
--
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void _dispatch (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+-class TAO_IFR_Client_Export ArrayDef : public virtual IDLType
++ class ArrayDef : public virtual IDLType
+ {
+ protected:
+ ArrayDef (void);
+@@ -13652,7 +13507,7 @@
+ TAO_default_environment ()
+ );
- ::IR::ArrayDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual const char* _interface_repository_id (void) const;
-+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual CORBA::ULong length (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_length_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Contained_ptr lookup (
-+ const char * search_name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void length (
-- CORBA::ULong length,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ IR_ContainedSeq * contents (
-+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_length_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_ContainedSeq * lookup_name (
-+ const char * search_name,
-+ CORBA::Long levels_to_search,
-+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual CORBA::TypeCode_ptr element_type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ 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
-+ ));
-
-- static void _get_element_type_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
++ IR_ArrayDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -13708,7 +13563,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::IDLType_ptr element_type_def (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ 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
-+ ));
-
-- static void _get_element_type_def_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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 void element_type_def (
++ virtual IR_IDLType_ptr element_type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -13725,7 +13580,7 @@
+ );
+
+ virtual void element_type_def (
- IR::IDLType_ptr element_type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ 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
-+ ));
-
-- static void _set_element_type_def_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
-
-- static void _get_type_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
-
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
-
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -13745,7 +13600,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
-
--
--#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_ServerRequestInfo_IR_ArrayDef_length_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::ArrayDef;
-- TAO_ServerRequestInfo_IR_ArrayDef_length_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ArrayDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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 Dynamic::ParameterList * arguments (
-+ 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 Dynamic::ExceptionList * exceptions (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ 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::Any * result (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ IR_DefinitionKind def_kind (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_ArrayDef_length_get (const TAO_ServerRequestInfo_IR_ArrayDef_length_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ArrayDef_length_get &);
--
-- private:
-- POA_IR::ArrayDef *_tao_impl;
-- void result (CORBA::ULong result);
-- // update the result
--CORBA::ULong _result;
--};
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
--class TAO_ServerRequestInfo_IR_ArrayDef_length_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ArrayDef;
-- TAO_ServerRequestInfo_IR_ArrayDef_length_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ArrayDef *tao_impl
-- ,
-- const CORBA::ULong & length,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void destroy (
-+ 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 Dynamic::ExceptionList * exceptions (
+@@ -13753,7 +13608,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
- private:
-- TAO_ServerRequestInfo_IR_ArrayDef_length_set (const TAO_ServerRequestInfo_IR_ArrayDef_length_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_ArrayDef_length_set &);
--
--private:
-- POA_IR::ArrayDef *_tao_impl;
-- const CORBA::ULong & length_;
--};
--
--class TAO_ServerRequestInfo_IR_ArrayDef_element_type_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ArrayDef;
-- TAO_ServerRequestInfo_IR_ArrayDef_element_type_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ArrayDef *tao_impl
-- ,
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ArrayDef_element_type_get (const TAO_ServerRequestInfo_IR_ArrayDef_element_type_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ArrayDef_element_type_get &);
--
--private:
-- POA_IR::ArrayDef *_tao_impl;
-- void result (CORBA::TypeCode_ptr result);
-- // update the result
--CORBA::TypeCode_ptr _result;
--};
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
--class TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ArrayDef;
-- TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ArrayDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ // copy and assignment are not allowed
-+ ExceptionDef_tie (const ExceptionDef_tie &);
-+ void operator= (const ExceptionDef_tie &);
-+ };
-
-- virtual Dynamic::ParameterList * arguments (
+@@ -13761,11 +13616,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get (const TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get &);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
-
--private:
-- POA_IR::ArrayDef *_tao_impl;
-- void result (IR::IDLType_ptr result);
-- // update the result
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -13971,7 +13825,7 @@
+ POA_IR::ArrayDef *_tao_impl;
+ void result (IR::IDLType_ptr result);
+ // update the result
-IR::IDLType_ptr _result;
--};
-+#endif /* ACE_HAS_USING_KEYWORD */
++ IR_IDLType_ptr _result;
+ };
--class TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ArrayDef;
-- TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ArrayDef *tao_impl
-- ,
+ class TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set : public TAO_ServerRequestInfo
+@@ -13982,7 +13836,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::ArrayDef *tao_impl
+ ,
- IR::IDLType_ptr element_type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class AttributeDef;
-+ typedef AttributeDef *AttributeDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
-+ class _TAO_AttributeDef_Strategized_Proxy_Broker;
-
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set (const TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set &);
--
--private:
-- POA_IR::ArrayDef *_tao_impl;
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -14021,27 +13875,26 @@
+
+ private:
+ POA_IR::ArrayDef *_tao_impl;
- IR::IDLType_ptr element_type_def_;
--};
-+ class AttributeDef : public virtual Contained
-+ {
-+ protected:
-+ AttributeDef (void);
-
--#endif /* TAO_HAS_INTERCEPTORS */
-+ public:
-+ AttributeDef (const AttributeDef& rhs);
-+ virtual ~AttributeDef (void);
++ IR_IDLType_ptr element_type_def_;
+ };
--};
+ #endif /* TAO_HAS_INTERCEPTORS */
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+ };
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Declaration
--//
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
+-
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Declaration
+ //
--class _TAO_ArrayDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ArrayDef_Proxy_Broker
--{
--public:
-- _TAO_ArrayDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_ArrayDef_Strategized_Proxy_Broker (void);
--
+-class TAO_IFR_Client_Export _TAO_ArrayDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ArrayDef_Proxy_Broker
++class _TAO_ArrayDef_Strategized_Proxy_Broker : public virtual _TAO_ArrayDef_Proxy_Broker
+ {
+ public:
+ _TAO_ArrayDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_ArrayDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_ArrayDef_Proxy_Impl &select_proxy (
- ::IR::ArrayDef *object,
-- CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-- );
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--private:
-+ static void _non_existent_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--// 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
-- );
-+ virtual void _dispatch (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ virtual _TAO_ArrayDef_Proxy_Impl &select_proxy (
++ IR_ArrayDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
--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.
+@@ -14059,7 +13912,7 @@
+ // 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.
- ::IR::_TAO_ArrayDef_Proxy_Impl
-- *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
--
-- TAO_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.
-+ IR_AttributeDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ _TAO_ArrayDef_Proxy_Impl
+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
+
+ TAO_SYNCH_MUTEX mutex_;
+@@ -14071,7 +13924,6 @@
+ static _TAO_ArrayDef_Strategized_Proxy_Broker *the_TAO_ArrayDef_Strategized_Proxy_Broker (void);
+ };
--public:
-- static _TAO_ArrayDef_Strategized_Proxy_Broker *the_TAO_ArrayDef_Strategized_Proxy_Broker (void);
--};
-+ virtual const char* _interface_repository_id (void) const;
-
-+ virtual CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--//
--// End Strategized Proxy Broker Declaration
--///////////////////////////////////////////////////////////////////////
-+ static void _get_type_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+-
+ //
+ // End Strategized Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -14081,8 +13933,8 @@
+ // ThruPOA Impl. Declaration
+ //
-+ virtual IR_IDLType_ptr type_def (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Impl. Declaration
--//
-+ static void _get_type_def_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--class _TAO_ArrayDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_ArrayDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_ArrayDef_Proxy_Impl,
-- public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
--
--{
--public:
-- _TAO_ArrayDef_ThruPOA_Proxy_Impl (void);
--
-- virtual ~_TAO_ArrayDef_ThruPOA_Proxy_Impl (void) { }
--
-- virtual CORBA::ULong length (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual void type_def (
-+ IR_IDLType_ptr type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- virtual void length (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::ULong length,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _set_type_def_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ 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_AttributeMode mode (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++class _TAO_ArrayDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_ArrayDef_Proxy_Impl,
+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
+ public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
+
+@@ -14117,7 +13969,7 @@
+ CORBA::SystemException
+ ));
- virtual IR::IDLType_ptr element_type_def (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _get_mode_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_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
-- ));
-+ virtual void mode (
-+ IR_AttributeMode mode,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--};
-+ static void _set_mode_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class ArrayDef_tie : public ArrayDef
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
-+
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Declaration
-+//
-+
-+class _TAO_AttributeDef_Strategized_Proxy_Broker : public virtual _TAO_AttributeDef_Proxy_Broker
- {
-+public:
-+ _TAO_AttributeDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_AttributeDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_AttributeDef_Proxy_Impl &select_proxy (
-+ IR_AttributeDef *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_AttributeDef_Proxy_Impl
-+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-+
-+ TAO_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:
-- ArrayDef_tie (T &t);
-- // the T& ctor
-- ArrayDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- ArrayDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- ArrayDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~ArrayDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- CORBA::ULong length (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static _TAO_AttributeDef_Strategized_Proxy_Broker *the_TAO_AttributeDef_Strategized_Proxy_Broker (void);
-+};
-
-- void length (
-- CORBA::ULong length,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+//
-+// End Strategized Proxy Broker Declaration
-+///////////////////////////////////////////////////////////////////////
-
-- CORBA::TypeCode_ptr element_type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-
-- IR::IDLType_ptr element_type_def (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Impl. Declaration
-+//
-+
-+class _TAO_AttributeDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_AttributeDef_Proxy_Impl,
-+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-+
-+{
-+public:
-+ _TAO_AttributeDef_ThruPOA_Proxy_Impl (void);
-+
-+ virtual ~_TAO_AttributeDef_ThruPOA_Proxy_Impl (void);
-+
-+ virtual CORBA::TypeCode_ptr type (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
++ virtual IR_IDLType_ptr element_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
+@@ -14127,7 +13979,7 @@
-- 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 ()
-+ virtual IR_IDLType_ptr type_def (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
+@@ -14141,11 +13993,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
-- CORBA::TypeCode_ptr type (
+-
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export ArrayDef_tie : public ArrayDef
++ class ArrayDef_tie : public ArrayDef
+ {
+ public:
+ ArrayDef_tie (T &t);
+@@ -14173,7 +14024,7 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_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::Environment &env =
+ TAO_default_environment ()
+ );
+ CORBA::ULong length (
+@@ -14201,7 +14052,7 @@
CORBA::SystemException
));
-- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual IR_AttributeMode mode (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
+- IR::IDLType_ptr element_type_def (
++ IR_IDLType_ptr element_type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
+@@ -14210,7 +14061,7 @@
));
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual void mode (
-+ CORBA_Object *_collocated_tao_target_,
-+ IR_AttributeMode mode,
-+ CORBA::Environment &ACE_TRY_ENV
+ void element_type_def (
+- IR::IDLType_ptr element_type_def,
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -14226,7 +14077,7 @@
CORBA::SystemException
));
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- ArrayDef_tie (const ArrayDef_tie &);
-- void operator= (const ArrayDef_tie &);
- };
-
--#endif /* ACE_HAS_USING_KEYWORD */
--
--class ExceptionDef;
--typedef ExceptionDef *ExceptionDef_ptr;
--// Forward Classes Declaration
--class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
--class _TAO_ExceptionDef_Strategized_Proxy_Broker;
-
--class ExceptionDef : public virtual Contained, public virtual Container
--{
--protected:
-- ExceptionDef (void);
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
-
--public:
-- ExceptionDef (const ExceptionDef& rhs);
-- virtual ~ExceptionDef (void);
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class AttributeDef_tie : public AttributeDef
-+ {
-+ public:
-+ AttributeDef_tie (T &t);
-+ // the T& ctor
-+ AttributeDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ AttributeDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ AttributeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~AttributeDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+- IR::DefinitionKind def_kind (
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -14260,7 +14111,7 @@
+ class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
+ class _TAO_ExceptionDef_Strategized_Proxy_Broker;
-+ IR_IDLType_ptr type_def (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void type_def (
-+ IR_IDLType_ptr type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+ IR_AttributeMode mode (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void mode (
-+ IR_AttributeMode mode,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void _dispatch (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+-class TAO_IFR_Client_Export ExceptionDef : public virtual Contained, public virtual Container
++ class ExceptionDef : public virtual Contained, public virtual Container
+ {
+ protected:
+ ExceptionDef (void);
+@@ -14303,7 +14154,7 @@
+ TAO_default_environment ()
+ );
- ::IR::ExceptionDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual const char* _interface_repository_id (void) const;
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual CORBA::TypeCode_ptr type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
-- static void _get_type_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_ExceptionDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -14326,7 +14177,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::StructMemberSeq * members (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_members_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void members (
++ virtual IR_StructMemberSeq * members (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -14343,7 +14194,7 @@
+ );
+
+ virtual void members (
- const IR::StructMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_members_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -14363,7 +14214,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -14371,7 +14222,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -14379,7 +14230,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -14387,7 +14238,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -14395,7 +14246,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -14403,7 +14254,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ // copy and assignment are not allowed
-+ AttributeDef_tie (const AttributeDef_tie &);
-+ void operator= (const AttributeDef_tie &);
-+ };
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -14411,7 +14262,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+#endif /* ACE_HAS_USING_KEYWORD */
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -14419,7 +14270,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class OperationDef;
-+ typedef OperationDef *OperationDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-+ class _TAO_OperationDef_Strategized_Proxy_Broker;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -14427,7 +14278,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class OperationDef : public virtual Contained
-+ {
-+ protected:
-+ OperationDef (void);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -14435,7 +14286,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ public:
-+ OperationDef (const OperationDef& rhs);
-+ virtual ~OperationDef (void);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -14443,7 +14294,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void lookup_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -14451,7 +14302,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void contents_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -14459,7 +14310,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void lookup_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void describe_contents_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -14467,7 +14318,7 @@
+ 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 ()
-+ );
-
-- static void create_module_skel (
-- 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 ()
-+ );
-
-- static void create_constant_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_OperationDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void create_struct_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -14475,7 +14326,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual const char* _interface_repository_id (void) const;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void create_union_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -14483,7 +14334,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::TypeCode_ptr result (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void create_enum_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -14491,7 +14342,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_result_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_alias_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -14499,7 +14350,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_IDLType_ptr result_def (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void create_interface_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -14507,7 +14358,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_result_def_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_value_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -14515,7 +14366,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void result_def (
-+ IR_IDLType_ptr result_def,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void create_value_box_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -14523,7 +14374,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_exception_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -14531,7 +14382,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_result_def_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_native_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -14539,7 +14390,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_ParDescriptionSeq * params (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -14547,7 +14398,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_params_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -14555,7 +14406,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void params (
-+ const IR_ParDescriptionSeq & params,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
--
--#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_ServerRequestInfo_IR_ExceptionDef_type_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::ExceptionDef;
-- TAO_ServerRequestInfo_IR_ExceptionDef_type_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ExceptionDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_params_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual Dynamic::ParameterList * arguments (
-+ virtual IR_OperationMode mode (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-+
-+ static void _get_mode_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-+ );
-+
-+ virtual void mode (
-+ IR_OperationMode mode,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_ExceptionDef_type_get (const TAO_ServerRequestInfo_IR_ExceptionDef_type_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ExceptionDef_type_get &);
--
-- private:
-- POA_IR::ExceptionDef *_tao_impl;
-- void result (CORBA::TypeCode_ptr result);
-- // update the result
--CORBA::TypeCode_ptr _result;
--};
--
--class TAO_ServerRequestInfo_IR_ExceptionDef_members_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ExceptionDef;
-- TAO_ServerRequestInfo_IR_ExceptionDef_members_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ExceptionDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- virtual Dynamic::ParameterList * arguments (
+@@ -14563,7 +14414,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -14571,7 +14422,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -14579,11 +14430,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ExceptionDef_members_get (const TAO_ServerRequestInfo_IR_ExceptionDef_members_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ExceptionDef_members_get &);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
-
--private:
-- POA_IR::ExceptionDef *_tao_impl;
-- void result (IR::StructMemberSeq * result);
-- // update the result
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -14688,7 +14538,7 @@
+ POA_IR::ExceptionDef *_tao_impl;
+ void result (IR::StructMemberSeq * result);
+ // update the result
-IR::StructMemberSeq * _result;
--};
-+ static void _set_mode_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--class TAO_ServerRequestInfo_IR_ExceptionDef_members_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ExceptionDef;
-- TAO_ServerRequestInfo_IR_ExceptionDef_members_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ExceptionDef *tao_impl
-- ,
-- const IR::StructMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_ContextIdSeq * contexts (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ IR_StructMemberSeq * _result;
+ };
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ExceptionDef_members_set (const TAO_ServerRequestInfo_IR_ExceptionDef_members_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_ExceptionDef_members_set &);
--
--private:
-- POA_IR::ExceptionDef *_tao_impl;
+ class TAO_ServerRequestInfo_IR_ExceptionDef_members_set : public TAO_ServerRequestInfo
+@@ -14699,7 +14549,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::ExceptionDef *tao_impl
+ ,
+- const IR::StructMemberSeq & members,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -14738,27 +14588,26 @@
+
+ private:
+ POA_IR::ExceptionDef *_tao_impl;
- const IR::StructMemberSeq & members_;
--};
-+ static void _get_contexts_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--#endif /* TAO_HAS_INTERCEPTORS */
-+ virtual void contexts (
-+ const IR_ContextIdSeq & contexts,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ const IR_StructMemberSeq & members_;
+ };
--};
-+ static void _set_contexts_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+ #endif /* TAO_HAS_INTERCEPTORS */
-+ virtual IR_ExceptionDefSeq * exceptions (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Declaration
--//
-+ static void _get_exceptions_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--class _TAO_ExceptionDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ExceptionDef_Proxy_Broker
--{
--public:
-- _TAO_ExceptionDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_ExceptionDef_Strategized_Proxy_Broker (void);
--
+ };
+
+-
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Declaration
+ //
+
+-class TAO_IFR_Client_Export _TAO_ExceptionDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ExceptionDef_Proxy_Broker
++class _TAO_ExceptionDef_Strategized_Proxy_Broker : public virtual _TAO_ExceptionDef_Proxy_Broker
+ {
+ public:
+ _TAO_ExceptionDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_ExceptionDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_ExceptionDef_Proxy_Impl &select_proxy (
- ::IR::ExceptionDef *object,
-- CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-- );
-+ virtual void exceptions (
-+ const IR_ExceptionDefSeq & exceptions,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--private:
-+ static void _set_exceptions_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--// 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
-- );
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ virtual _TAO_ExceptionDef_Proxy_Impl &select_proxy (
++ IR_ExceptionDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
--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.
+@@ -14776,7 +14625,7 @@
+ // 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.
- ::IR::_TAO_ExceptionDef_Proxy_Impl
-- *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
--
-- TAO_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.
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ _TAO_ExceptionDef_Proxy_Impl
+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
+
+ TAO_SYNCH_MUTEX mutex_;
+@@ -14788,7 +14637,6 @@
+ static _TAO_ExceptionDef_Strategized_Proxy_Broker *the_TAO_ExceptionDef_Strategized_Proxy_Broker (void);
+ };
--public:
-- static _TAO_ExceptionDef_Strategized_Proxy_Broker *the_TAO_ExceptionDef_Strategized_Proxy_Broker (void);
--};
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--//
--// End Strategized Proxy Broker Declaration
--///////////////////////////////////////////////////////////////////////
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Impl. Declaration
--//
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--class _TAO_ExceptionDef_ThruPOA_Proxy_Impl :
+-
+ //
+ // End Strategized Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -14798,8 +14646,8 @@
+ // ThruPOA Impl. Declaration
+ //
+
+-class TAO_IFR_Client_Export _TAO_ExceptionDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_ExceptionDef_Proxy_Impl,
-- public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl
--
--{
--public:
-- _TAO_ExceptionDef_ThruPOA_Proxy_Impl (void);
--
-- virtual ~_TAO_ExceptionDef_ThruPOA_Proxy_Impl (void) { }
--
-- virtual CORBA::TypeCode_ptr type (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++class _TAO_ExceptionDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_ExceptionDef_Proxy_Impl,
+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl,
+ public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl
+@@ -14818,7 +14666,7 @@
+ CORBA::SystemException
+ ));
- virtual IR::StructMemberSeq * members (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ virtual IR_StructMemberSeq * members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -14828,7 +14676,7 @@
-- virtual void members (
-- CORBA_Object *_collocated_tao_target_,
+ virtual void members (
+ CORBA_Object *_collocated_tao_target_,
- const IR::StructMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--};
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
-
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Declaration
-+//
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -14842,11 +14690,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class ExceptionDef_tie : public ExceptionDef
-+class _TAO_OperationDef_Strategized_Proxy_Broker : public virtual _TAO_OperationDef_Proxy_Broker
+-
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export ExceptionDef_tie : public ExceptionDef
++ class ExceptionDef_tie : public ExceptionDef
{
--public:
-- ExceptionDef_tie (T &t);
-- // the T& ctor
-- ExceptionDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- ExceptionDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- ExceptionDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~ExceptionDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- CORBA::TypeCode_ptr type (
+ public:
+ ExceptionDef_tie (T &t);
+@@ -14874,7 +14721,7 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+ CORBA::TypeCode_ptr type (
+@@ -14885,7 +14732,7 @@
+ CORBA::SystemException
+ ));
+
- IR::StructMemberSeq * members (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+public:
-+ _TAO_OperationDef_Strategized_Proxy_Broker (void);
++ IR_StructMemberSeq * members (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -14894,7 +14741,7 @@
+ ));
-- void members (
+ void members (
- const IR::StructMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual ~_TAO_OperationDef_Strategized_Proxy_Broker (void);
-
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual _TAO_OperationDef_Proxy_Impl &select_proxy (
-+ IR_OperationDef *object,
-+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-+ );
-
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+private:
-
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+// 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
-+ );
-
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+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_OperationDef_Proxy_Impl
-+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-+
-+ TAO_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.
-
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+public:
-+ static _TAO_OperationDef_Strategized_Proxy_Broker *the_TAO_OperationDef_Strategized_Proxy_Broker (void);
-+};
-
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+//
-+// End Strategized Proxy Broker Declaration
-+///////////////////////////////////////////////////////////////////////
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -14953,7 +14800,7 @@
+ CORBA::SystemException
+ ));
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Impl. Declaration
-+//
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -14969,7 +14816,7 @@
+ CORBA::SystemException
+ ));
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+class _TAO_OperationDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_OperationDef_Proxy_Impl,
-+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-+
-+{
-+public:
-+ _TAO_OperationDef_ThruPOA_Proxy_Impl (void);
-+
-+ virtual ~_TAO_OperationDef_ThruPOA_Proxy_Impl (void);
-+
-+ virtual CORBA::TypeCode_ptr result (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -14977,7 +14824,7 @@
CORBA::SystemException
));
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual IR_IDLType_ptr result_def (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
+@@ -14986,7 +14833,7 @@
));
-- void move (
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_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 ((
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -14996,7 +14843,7 @@
CORBA::SystemException
));
- IR::Contained_ptr lookup (
-- const char * search_name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual IR_ParDescriptionSeq * params (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
++ IR_Contained_ptr lookup (
+ const char * search_name,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -15005,8 +14852,8 @@
CORBA::SystemException
));
- IR::ContainedSeq * contents (
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual void params (
-+ CORBA_Object *_collocated_tao_target_,
-+ const IR_ParDescriptionSeq & params,
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
++ IR_ContainedSeq * contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -15015,10 +14862,10 @@
CORBA::SystemException
));
- IR::ContainedSeq * lookup_name (
-- const char * search_name,
-- CORBA::Long levels_to_search,
++ IR_ContainedSeq * lookup_name (
+ const char * search_name,
+ CORBA::Long levels_to_search,
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- 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 ((
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -15027,8 +14874,8 @@
CORBA::SystemException
));
- 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 ()
-+ virtual void mode (
-+ CORBA_Object *_collocated_tao_target_,
-+ IR_OperationMode mode,
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
++ IR_Container::DescriptionSeq * describe_contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Long max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -15038,7 +14885,7 @@
CORBA::SystemException
));
- IR::ModuleDef_ptr create_module (
-- const char * id,
-- const char * name,
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual IR_ContextIdSeq * contexts (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
++ IR_ModuleDef_ptr create_module (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -15049,11 +14896,11 @@
CORBA::SystemException
));
- IR::ConstantDef_ptr create_constant (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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 ()
-+ virtual void contexts (
-+ CORBA_Object *_collocated_tao_target_,
-+ const IR_ContextIdSeq & contexts,
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
++ IR_IDLType_ptr type,
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -15062,11 +14909,11 @@
CORBA::SystemException
));
- IR::StructDef_ptr create_struct (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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 ()
-+ virtual IR_ExceptionDefSeq * exceptions (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -15074,12 +14921,12 @@
CORBA::SystemException
));
- IR::UnionDef_ptr create_union (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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 ()
-+ virtual void exceptions (
-+ CORBA_Object *_collocated_tao_target_,
-+ const IR_ExceptionDefSeq & exceptions,
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_IDLType_ptr discriminator_type,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -15087,11 +14934,11 @@
CORBA::SystemException
));
- IR::EnumDef_ptr create_enum (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+};
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -15099,11 +14946,11 @@
+ CORBA::SystemException
+ ));
- IR::AliasDef_ptr create_alias (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
++ IR_IDLType_ptr original_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -15111,11 +14958,11 @@
+ CORBA::SystemException
+ ));
- IR::InterfaceDef_ptr create_interface (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -15125,17 +14972,17 @@
+ CORBA::SystemException
+ ));
- 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 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,
++ 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
-- ));
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class OperationDef_tie : public OperationDef
-+ {
-+ public:
-+ OperationDef_tie (T &t);
-+ // the T& ctor
-+ OperationDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ OperationDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ OperationDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~OperationDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ CORBA::TypeCode_ptr result (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_ValueDefSeq & abstract_base_values,
++ const IR_InterfaceDefSeq & supported_interfaces,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -15143,11 +14990,11 @@
+ CORBA::SystemException
+ ));
- IR::ValueBoxDef_ptr create_value_box (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ IR_IDLType_ptr result_def (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -15155,11 +15002,11 @@
+ CORBA::SystemException
+ ));
- IR::ExceptionDef_ptr create_exception (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ void result_def (
-+ IR_IDLType_ptr result_def,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -15167,7 +15014,7 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
-+ IR_ParDescriptionSeq * params (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_NativeDef_ptr create_native (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -15178,7 +15025,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void params (
-+ const IR_ParDescriptionSeq & params,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_OperationMode mode (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- ExceptionDef_tie (const ExceptionDef_tie &);
-- void operator= (const ExceptionDef_tie &);
--};
-+ void mode (
-+ IR_OperationMode mode,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--#endif /* ACE_HAS_USING_KEYWORD */
-+ IR_ContextIdSeq * contexts (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class AttributeDef;
--typedef AttributeDef *AttributeDef_ptr;
--// Forward Classes Declaration
--class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
--class _TAO_AttributeDef_Strategized_Proxy_Broker;
-+ void contexts (
-+ const IR_ContextIdSeq & contexts,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class AttributeDef : public virtual Contained
--{
--protected:
-- AttributeDef (void);
-+ IR_ExceptionDefSeq * exceptions (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -15212,7 +15059,7 @@
+ class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
+ class _TAO_AttributeDef_Strategized_Proxy_Broker;
--public:
-- AttributeDef (const AttributeDef& rhs);
-- virtual ~AttributeDef (void);
-+ void exceptions (
-+ const IR_ExceptionDefSeq & exceptions,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void _dispatch (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+-class TAO_IFR_Client_Export AttributeDef : public virtual Contained
++ class AttributeDef : public virtual Contained
+ {
+ protected:
+ AttributeDef (void);
+@@ -15255,7 +15102,7 @@
+ TAO_default_environment ()
+ );
- ::IR::AttributeDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual const char* _interface_repository_id (void) const;
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual CORBA::TypeCode_ptr type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_type_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_AttributeDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -15278,7 +15125,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::IDLType_ptr type_def (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_type_def_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void type_def (
++ virtual IR_IDLType_ptr type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -15295,7 +15142,7 @@
+ );
+
+ virtual void type_def (
- IR::IDLType_ptr type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_type_def_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -15311,7 +15158,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::AttributeMode mode (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ // copy and assignment are not allowed
-+ OperationDef_tie (const OperationDef_tie &);
-+ void operator= (const OperationDef_tie &);
-+ };
-
-- static void _get_mode_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+#endif /* ACE_HAS_USING_KEYWORD */
++ virtual IR_AttributeMode mode (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -15328,7 +15175,7 @@
+ );
-- virtual void mode (
+ virtual void mode (
- IR::AttributeMode mode,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ class InterfaceDef;
-+ typedef InterfaceDef *InterfaceDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-+ class _TAO_InterfaceDef_Strategized_Proxy_Broker;
-
-- static void _set_mode_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class InterfaceDef : public virtual Container, public virtual Contained, public virtual IDLType
-+ {
-+ protected:
-+ InterfaceDef (void);
-
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ IR_AttributeMode mode,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -15348,7 +15195,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ public:
-+ InterfaceDef (const InterfaceDef& rhs);
-+ virtual ~InterfaceDef (void);
-
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -15356,7 +15203,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -15364,7 +15211,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -15372,7 +15219,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -15380,7 +15227,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
-
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -15388,7 +15235,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_defined_in_skel (
-- 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 ()
-+ );
-
-- static void _get_absolute_name_skel (
-- 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 ()
-+ );
-
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_InterfaceDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -15396,7 +15243,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual const char* _interface_repository_id (void) const;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -15404,7 +15251,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_InterfaceDefSeq * base_interfaces (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_base_interfaces_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -15412,7 +15259,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void base_interfaces (
-+ const IR_InterfaceDefSeq & base_interfaces,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
--
--#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_ServerRequestInfo_IR_AttributeDef_type_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::AttributeDef;
-- TAO_ServerRequestInfo_IR_AttributeDef_type_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::AttributeDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_base_interfaces_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual Dynamic::ParameterList * arguments (
-+ virtual CORBA::Boolean is_abstract (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-+
-+ static void _get_is_abstract_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-+ );
-+
-+ virtual void is_abstract (
-+ CORBA::Boolean is_abstract,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_AttributeDef_type_get (const TAO_ServerRequestInfo_IR_AttributeDef_type_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_AttributeDef_type_get &);
--
-- private:
-- POA_IR::AttributeDef *_tao_impl;
-- void result (CORBA::TypeCode_ptr result);
-- // update the result
--CORBA::TypeCode_ptr _result;
--};
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
+@@ -15420,7 +15267,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
--class TAO_ServerRequestInfo_IR_AttributeDef_type_def_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::AttributeDef;
-- TAO_ServerRequestInfo_IR_AttributeDef_type_def_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::AttributeDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_is_abstract_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual Dynamic::ParameterList * arguments (
+@@ -15428,7 +15275,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -15436,7 +15283,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -15444,11 +15291,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_AttributeDef_type_def_get (const TAO_ServerRequestInfo_IR_AttributeDef_type_def_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_AttributeDef_type_def_get &);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
-
--private:
-- POA_IR::AttributeDef *_tao_impl;
-- void result (IR::IDLType_ptr result);
-- // update the result
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -15553,7 +15399,7 @@
+ POA_IR::AttributeDef *_tao_impl;
+ void result (IR::IDLType_ptr result);
+ // update the result
-IR::IDLType_ptr _result;
--};
-+ virtual CORBA::Boolean is_local (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--class TAO_ServerRequestInfo_IR_AttributeDef_type_def_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::AttributeDef;
-- TAO_ServerRequestInfo_IR_AttributeDef_type_def_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::AttributeDef *tao_impl
-- ,
++ IR_IDLType_ptr _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_AttributeDef_type_def_set : public TAO_ServerRequestInfo
+@@ -15564,7 +15410,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::AttributeDef *tao_impl
+ ,
- IR::IDLType_ptr type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_is_local_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_AttributeDef_type_def_set (const TAO_ServerRequestInfo_IR_AttributeDef_type_def_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_AttributeDef_type_def_set &);
--
--private:
-- POA_IR::AttributeDef *_tao_impl;
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -15603,7 +15449,7 @@
+
+ private:
+ POA_IR::AttributeDef *_tao_impl;
- IR::IDLType_ptr type_def_;
--};
-+ virtual void is_local (
-+ CORBA::Boolean is_local,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--class TAO_ServerRequestInfo_IR_AttributeDef_mode_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::AttributeDef;
-- TAO_ServerRequestInfo_IR_AttributeDef_mode_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::AttributeDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_is_local_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_AttributeDef_mode_get (const TAO_ServerRequestInfo_IR_AttributeDef_mode_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_AttributeDef_mode_get &);
--
--private:
-- POA_IR::AttributeDef *_tao_impl;
-- void result (IR::AttributeMode result);
-- // update the result
++ IR_IDLType_ptr type_def_;
+ };
+
+ class TAO_ServerRequestInfo_IR_AttributeDef_mode_get : public TAO_ServerRequestInfo
+@@ -15654,7 +15500,7 @@
+ POA_IR::AttributeDef *_tao_impl;
+ void result (IR::AttributeMode result);
+ // update the result
-IR::AttributeMode _result;
--};
-+ virtual CORBA::Boolean is_a (
-+ const char * interface_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--class TAO_ServerRequestInfo_IR_AttributeDef_mode_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::AttributeDef;
-- TAO_ServerRequestInfo_IR_AttributeDef_mode_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::AttributeDef *tao_impl
-- ,
++ IR_AttributeMode _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_AttributeDef_mode_set : public TAO_ServerRequestInfo
+@@ -15665,7 +15511,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::AttributeDef *tao_impl
+ ,
- IR::AttributeMode & mode,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void is_a_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_AttributeDef_mode_set (const TAO_ServerRequestInfo_IR_AttributeDef_mode_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_AttributeDef_mode_set &);
--
--private:
-- POA_IR::AttributeDef *_tao_impl;
++ IR_AttributeMode & mode,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -15704,27 +15550,26 @@
+
+ private:
+ POA_IR::AttributeDef *_tao_impl;
- const IR::AttributeMode & mode_;
--};
-+ 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,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--#endif /* TAO_HAS_INTERCEPTORS */
-+ static void create_attribute_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ const IR_AttributeMode & mode_;
+ };
--};
-+ 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,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-+
-+ static void create_operation_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-+
-+ static void lookup_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void contents_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void lookup_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void describe_contents_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_module_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_constant_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_struct_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_union_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_enum_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_alias_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_interface_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_value_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_value_box_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_exception_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void create_native_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_type_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
+ #endif /* TAO_HAS_INTERCEPTORS */
+ };
+
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Declaration
//
--class _TAO_AttributeDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_AttributeDef_Proxy_Broker
-+class _TAO_InterfaceDef_Strategized_Proxy_Broker : public virtual _TAO_InterfaceDef_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_AttributeDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_AttributeDef_Proxy_Broker
++class _TAO_AttributeDef_Strategized_Proxy_Broker : public virtual _TAO_AttributeDef_Proxy_Broker
{
public:
-- _TAO_AttributeDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_AttributeDef_Strategized_Proxy_Broker (void);
--
+ _TAO_AttributeDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_AttributeDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_AttributeDef_Proxy_Impl &select_proxy (
- ::IR::AttributeDef *object,
-+ _TAO_InterfaceDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_InterfaceDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_InterfaceDef_Proxy_Impl &select_proxy (
-+ IR_InterfaceDef *object,
++ virtual _TAO_AttributeDef_Proxy_Impl &select_proxy (
++ IR_AttributeDef *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -15742,7 +12595,7 @@
+@@ -15742,7 +15587,7 @@
// 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.
- ::IR::_TAO_AttributeDef_Proxy_Impl
-+ _TAO_InterfaceDef_Proxy_Impl
++ _TAO_AttributeDef_Proxy_Impl
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -15751,10 +12604,9 @@
- // interface.
-
- public:
-- static _TAO_AttributeDef_Strategized_Proxy_Broker *the_TAO_AttributeDef_Strategized_Proxy_Broker (void);
-+ static _TAO_InterfaceDef_Strategized_Proxy_Broker *the_TAO_InterfaceDef_Strategized_Proxy_Broker (void);
+@@ -15754,7 +15599,6 @@
+ static _TAO_AttributeDef_Strategized_Proxy_Broker *the_TAO_AttributeDef_Strategized_Proxy_Broker (void);
};
-
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-@@ -15764,1186 +12616,810 @@
+@@ -15764,8 +15608,8 @@
// ThruPOA Impl. Declaration
//
--class _TAO_AttributeDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_AttributeDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_AttributeDef_Proxy_Impl,
-+class _TAO_InterfaceDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_InterfaceDef_Proxy_Impl,
++class _TAO_AttributeDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_AttributeDef_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-+ public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
-
- {
- public:
-- _TAO_AttributeDef_ThruPOA_Proxy_Impl (void);
-+ _TAO_InterfaceDef_ThruPOA_Proxy_Impl (void);
-
-- virtual ~_TAO_AttributeDef_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_InterfaceDef_ThruPOA_Proxy_Impl (void);
+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-- virtual CORBA::TypeCode_ptr type (
-+ virtual IR_InterfaceDefSeq * base_interfaces (
- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
+@@ -15783,7 +15627,7 @@
CORBA::SystemException
));
- virtual IR::IDLType_ptr type_def (
-+ virtual void base_interfaces (
++ virtual IR_IDLType_ptr type_def (
CORBA_Object *_collocated_tao_target_,
-+ const IR_InterfaceDefSeq & base_interfaces,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
+@@ -15793,14 +15637,14 @@
-- virtual void type_def (
-+ virtual CORBA::Boolean is_abstract (
+ virtual void type_def (
CORBA_Object *_collocated_tao_target_,
- IR::IDLType_ptr type_def,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual IR::AttributeMode mode (
-+ virtual void is_abstract (
++ virtual IR_AttributeMode mode (
CORBA_Object *_collocated_tao_target_,
-+ CORBA::Boolean is_abstract,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
+@@ -15810,7 +15654,7 @@
-- virtual void mode (
-+ virtual CORBA::Boolean is_local (
+ virtual void mode (
CORBA_Object *_collocated_tao_target_,
- IR::AttributeMode mode,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_AttributeMode mode,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
+@@ -15824,11 +15668,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
--};
--
-
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
--
--
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class AttributeDef_tie : public AttributeDef
--{
--public:
-- AttributeDef_tie (T &t);
-- // the T& ctor
-- AttributeDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- AttributeDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- AttributeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~AttributeDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- CORBA::TypeCode_ptr type (
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export AttributeDef_tie : public AttributeDef
++ class AttributeDef_tie : public AttributeDef
+ {
+ public:
+ AttributeDef_tie (T &t);
+@@ -15856,7 +15699,7 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+ CORBA::TypeCode_ptr type (
+@@ -15867,7 +15710,7 @@
+ CORBA::SystemException
+ ));
+
- IR::IDLType_ptr type_def (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void type_def (
++ IR_IDLType_ptr type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -15876,7 +15719,7 @@
+ ));
+
+ void type_def (
- IR::IDLType_ptr type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- IR::AttributeMode mode (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void mode (
-- IR::AttributeMode mode,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual void is_local (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Boolean is_local,
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -15884,7 +15727,7 @@
CORBA::SystemException
));
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual CORBA::Boolean is_a (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * interface_id,
-+ CORBA::Environment &ACE_TRY_ENV
+- IR::AttributeMode mode (
++ IR_AttributeMode mode (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
+@@ -15893,7 +15736,7 @@
));
-- void id (
-+ virtual IR_AttributeDef_ptr create_attribute (
-+ CORBA_Object *_collocated_tao_target_,
- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void name (
- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void version (
- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ IR_IDLType_ptr type,
-+ IR_AttributeMode mode,
-+ const IR_ExceptionDefSeq & get_exceptions,
-+ const IR_ExceptionDefSeq & put_exceptions,
-+ CORBA::Environment &ACE_TRY_ENV
+ void mode (
+- IR::AttributeMode mode,
++ IR_AttributeMode mode,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -15952,7 +15795,7 @@
CORBA::SystemException
));
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ 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
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -15968,7 +15811,7 @@
CORBA::SystemException
));
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+};
-
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -15976,7 +15819,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -15985,7 +15828,7 @@
+ ));
-- void move (
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class InterfaceDef_tie : public InterfaceDef
-+ {
-+ public:
-+ InterfaceDef_tie (T &t);
-+ // the T& ctor
-+ InterfaceDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ InterfaceDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ InterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~InterfaceDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ IR_InterfaceDefSeq * base_interfaces (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -15995,7 +15838,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void base_interfaces (
-+ const IR_InterfaceDefSeq & base_interfaces,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ CORBA::Boolean is_abstract (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- AttributeDef_tie (const AttributeDef_tie &);
-- void operator= (const AttributeDef_tie &);
--};
-+ void is_abstract (
-+ CORBA::Boolean is_abstract,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--#endif /* ACE_HAS_USING_KEYWORD */
-+ CORBA::Boolean is_local (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class OperationDef;
--typedef OperationDef *OperationDef_ptr;
--// Forward Classes Declaration
--class _TAO_OperationDef_ThruPOA_Proxy_Impl;
--class _TAO_OperationDef_Strategized_Proxy_Broker;
-+ void is_local (
-+ CORBA::Boolean is_local,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class OperationDef : public virtual Contained
--{
--protected:
-- OperationDef (void);
-+ CORBA::Boolean is_a (
-+ const char * interface_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--public:
-- OperationDef (const OperationDef& rhs);
-- virtual ~OperationDef (void);
-+ 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,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -16029,7 +15872,7 @@
+ class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+ class _TAO_OperationDef_Strategized_Proxy_Broker;
-+ 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,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Contained_ptr lookup (
-+ const char * search_name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+ IR_ContainedSeq * contents (
-+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_ContainedSeq * lookup_name (
-+ const char * search_name,
-+ CORBA::Long levels_to_search,
-+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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 void _dispatch (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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_IFR_Client_Export OperationDef : public virtual Contained
++ class OperationDef : public virtual Contained
+ {
+ protected:
+ OperationDef (void);
+@@ -16072,7 +15915,7 @@
+ TAO_default_environment ()
+ );
- ::IR::OperationDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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 const char* _interface_repository_id (void) const;
-+ 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 CORBA::TypeCode_ptr result (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ 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
-+ ));
-
-- static void _get_result_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
++ IR_OperationDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -16095,7 +15938,7 @@
+ TAO_default_environment ()
+ );
+
- virtual IR::IDLType_ptr result_def (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ 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
-+ ));
-
-- static void _get_result_def_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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 void result_def (
++ virtual IR_IDLType_ptr result_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -16112,7 +15955,7 @@
+ );
+
+ virtual void result_def (
- IR::IDLType_ptr result_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ 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
-+ ));
-
-- static void _set_result_def_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
++ IR_IDLType_ptr result_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -16128,7 +15971,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::ParDescriptionSeq * params (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ 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
-+ ));
-
-- static void _get_params_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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 void params (
++ virtual IR_ParDescriptionSeq * params (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -16145,7 +15988,7 @@
+ );
+
+ virtual void params (
- const IR::ParDescriptionSeq & params,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ 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
-+ ));
-
-- static void _set_params_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_ParDescriptionSeq & params,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -16161,7 +16004,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::OperationMode mode (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_mode_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void mode (
++ virtual IR_OperationMode mode (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -16178,7 +16021,7 @@
+ );
+
+ virtual void mode (
- IR::OperationMode mode,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_mode_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_OperationMode mode,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -16194,7 +16037,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::ContextIdSeq * contexts (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_contexts_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void contexts (
++ virtual IR_ContextIdSeq * contexts (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -16211,7 +16054,7 @@
+ );
+
+ virtual void contexts (
- const IR::ContextIdSeq & contexts,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_contexts_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -16227,7 +16070,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::ExceptionDefSeq * exceptions (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_exceptions_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void exceptions (
++ virtual IR_ExceptionDefSeq * exceptions (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -16244,7 +16087,7 @@
+ );
+
+ virtual void exceptions (
- const IR::ExceptionDefSeq & exceptions,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_exceptions_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -16264,7 +16107,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -16272,7 +16115,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -16280,7 +16123,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ // copy and assignment are not allowed
-+ InterfaceDef_tie (const InterfaceDef_tie &);
-+ void operator= (const InterfaceDef_tie &);
-+ };
-
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -16288,7 +16131,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+#endif /* ACE_HAS_USING_KEYWORD */
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -16296,7 +16139,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class ValueMemberDef;
-+ typedef ValueMemberDef *ValueMemberDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
-+ class _TAO_ValueMemberDef_Strategized_Proxy_Broker;
-
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -16304,7 +16147,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class ValueMemberDef : public virtual Contained
-+ {
-+ protected:
-+ ValueMemberDef (void);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -16312,7 +16155,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ public:
-+ ValueMemberDef (const ValueMemberDef& rhs);
-+ virtual ~ValueMemberDef (void);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -16320,7 +16163,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -16328,7 +16171,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -16336,7 +16179,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_def_kind_skel (
-- 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 ()
-+ );
-
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -16344,7 +16187,7 @@
+ 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 ()
-+ );
-
--
--#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_ServerRequestInfo_IR_OperationDef_result_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::OperationDef;
-- TAO_ServerRequestInfo_IR_OperationDef_result_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_ValueMemberDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-+
-+ virtual const char* _interface_repository_id (void) const;
-
-- virtual Dynamic::ParameterList * arguments (
-+ virtual CORBA::TypeCode_ptr type (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-+
-+ static void _get_type_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-+ );
-+
-+ virtual IR_IDLType_ptr type_def (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_OperationDef_result_get (const TAO_ServerRequestInfo_IR_OperationDef_result_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_OperationDef_result_get &);
--
-- private:
-- POA_IR::OperationDef *_tao_impl;
-- void result (CORBA::TypeCode_ptr result);
-- // update the result
--CORBA::TypeCode_ptr _result;
--};
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
--class TAO_ServerRequestInfo_IR_OperationDef_result_def_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::OperationDef;
-- TAO_ServerRequestInfo_IR_OperationDef_result_def_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_type_def_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual Dynamic::ParameterList * arguments (
+@@ -16352,7 +16195,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- 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 &env =
+ TAO_default_environment ()
+ );
+
+@@ -16360,11 +16203,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_OperationDef_result_def_get (const TAO_ServerRequestInfo_IR_OperationDef_result_def_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_OperationDef_result_def_get &);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
-
--private:
-- POA_IR::OperationDef *_tao_impl;
-- void result (IR::IDLType_ptr result);
-- // update the result
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -16469,7 +16311,7 @@
+ POA_IR::OperationDef *_tao_impl;
+ void result (IR::IDLType_ptr result);
+ // update the result
-IR::IDLType_ptr _result;
--};
-+ virtual void type_def (
-+ IR_IDLType_ptr type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--class TAO_ServerRequestInfo_IR_OperationDef_result_def_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::OperationDef;
-- TAO_ServerRequestInfo_IR_OperationDef_result_def_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
++ IR_IDLType_ptr _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_OperationDef_result_def_set : public TAO_ServerRequestInfo
+@@ -16480,7 +16322,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::OperationDef *tao_impl
+ ,
- IR::IDLType_ptr result_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_type_def_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_OperationDef_result_def_set (const TAO_ServerRequestInfo_IR_OperationDef_result_def_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_OperationDef_result_def_set &);
--
--private:
-- POA_IR::OperationDef *_tao_impl;
++ IR_IDLType_ptr result_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -16519,7 +16361,7 @@
+
+ private:
+ POA_IR::OperationDef *_tao_impl;
- IR::IDLType_ptr result_def_;
--};
-+ virtual CORBA::Visibility access (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--class TAO_ServerRequestInfo_IR_OperationDef_params_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::OperationDef;
-- TAO_ServerRequestInfo_IR_OperationDef_params_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_access_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_OperationDef_params_get (const TAO_ServerRequestInfo_IR_OperationDef_params_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_OperationDef_params_get &);
--
--private:
-- POA_IR::OperationDef *_tao_impl;
-- void result (IR::ParDescriptionSeq * result);
-- // update the result
++ IR_IDLType_ptr result_def_;
+ };
+
+ class TAO_ServerRequestInfo_IR_OperationDef_params_get : public TAO_ServerRequestInfo
+@@ -16570,7 +16412,7 @@
+ POA_IR::OperationDef *_tao_impl;
+ void result (IR::ParDescriptionSeq * result);
+ // update the result
-IR::ParDescriptionSeq * _result;
--};
-+ virtual void access (
-+ CORBA::Visibility access,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--class TAO_ServerRequestInfo_IR_OperationDef_params_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::OperationDef;
-- TAO_ServerRequestInfo_IR_OperationDef_params_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
++ IR_ParDescriptionSeq * _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_OperationDef_params_set : public TAO_ServerRequestInfo
+@@ -16581,7 +16423,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::OperationDef *tao_impl
+ ,
- const IR::ParDescriptionSeq & params,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_access_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_OperationDef_params_set (const TAO_ServerRequestInfo_IR_OperationDef_params_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_OperationDef_params_set &);
--
--private:
-- POA_IR::OperationDef *_tao_impl;
++ const IR_ParDescriptionSeq & params,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -16620,7 +16462,7 @@
+
+ private:
+ POA_IR::OperationDef *_tao_impl;
- const IR::ParDescriptionSeq & params_;
--};
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ const IR_ParDescriptionSeq & params_;
+ };
--class TAO_ServerRequestInfo_IR_OperationDef_mode_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::OperationDef;
-- TAO_ServerRequestInfo_IR_OperationDef_mode_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_OperationDef_mode_get (const TAO_ServerRequestInfo_IR_OperationDef_mode_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_OperationDef_mode_get &);
--
--private:
-- POA_IR::OperationDef *_tao_impl;
-- void result (IR::OperationMode result);
-- // update the result
+ class TAO_ServerRequestInfo_IR_OperationDef_mode_get : public TAO_ServerRequestInfo
+@@ -16671,7 +16513,7 @@
+ POA_IR::OperationDef *_tao_impl;
+ void result (IR::OperationMode result);
+ // update the result
-IR::OperationMode _result;
--};
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_OperationMode _result;
+ };
--class TAO_ServerRequestInfo_IR_OperationDef_mode_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::OperationDef;
-- TAO_ServerRequestInfo_IR_OperationDef_mode_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
+ class TAO_ServerRequestInfo_IR_OperationDef_mode_set : public TAO_ServerRequestInfo
+@@ -16682,7 +16524,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::OperationDef *tao_impl
+ ,
- 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));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_OperationDef_mode_set (const TAO_ServerRequestInfo_IR_OperationDef_mode_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_OperationDef_mode_set &);
--
--private:
-- POA_IR::OperationDef *_tao_impl;
++ IR_OperationMode & mode,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -16721,7 +16563,7 @@
+
+ private:
+ POA_IR::OperationDef *_tao_impl;
- const IR::OperationMode & mode_;
--};
--
--class TAO_ServerRequestInfo_IR_OperationDef_contexts_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::OperationDef;
-- TAO_ServerRequestInfo_IR_OperationDef_contexts_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_OperationDef_contexts_get (const TAO_ServerRequestInfo_IR_OperationDef_contexts_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_OperationDef_contexts_get &);
--
--private:
-- POA_IR::OperationDef *_tao_impl;
-- void result (IR::ContextIdSeq * result);
-- // update the result
++ const IR_OperationMode & mode_;
+ };
+
+ class TAO_ServerRequestInfo_IR_OperationDef_contexts_get : public TAO_ServerRequestInfo
+@@ -16772,7 +16614,7 @@
+ POA_IR::OperationDef *_tao_impl;
+ void result (IR::ContextIdSeq * result);
+ // update the result
-IR::ContextIdSeq * _result;
--};
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_ContextIdSeq * _result;
+ };
--class TAO_ServerRequestInfo_IR_OperationDef_contexts_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::OperationDef;
-- TAO_ServerRequestInfo_IR_OperationDef_contexts_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
+ class TAO_ServerRequestInfo_IR_OperationDef_contexts_set : public TAO_ServerRequestInfo
+@@ -16783,7 +16625,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::OperationDef *tao_impl
+ ,
- const IR::ContextIdSeq & contexts,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_OperationDef_contexts_set (const TAO_ServerRequestInfo_IR_OperationDef_contexts_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_OperationDef_contexts_set &);
--
--private:
-- POA_IR::OperationDef *_tao_impl;
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -16822,7 +16664,7 @@
+
+ private:
+ POA_IR::OperationDef *_tao_impl;
- const IR::ContextIdSeq & contexts_;
--};
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ const IR_ContextIdSeq & contexts_;
+ };
--class TAO_ServerRequestInfo_IR_OperationDef_exceptions_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::OperationDef;
-- TAO_ServerRequestInfo_IR_OperationDef_exceptions_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_OperationDef_exceptions_get (const TAO_ServerRequestInfo_IR_OperationDef_exceptions_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_OperationDef_exceptions_get &);
--
--private:
-- POA_IR::OperationDef *_tao_impl;
-- void result (IR::ExceptionDefSeq * result);
-- // update the result
+ class TAO_ServerRequestInfo_IR_OperationDef_exceptions_get : public TAO_ServerRequestInfo
+@@ -16873,7 +16715,7 @@
+ POA_IR::OperationDef *_tao_impl;
+ void result (IR::ExceptionDefSeq * result);
+ // update the result
-IR::ExceptionDefSeq * _result;
--};
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_ExceptionDefSeq * _result;
+ };
--class TAO_ServerRequestInfo_IR_OperationDef_exceptions_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::OperationDef;
-- TAO_ServerRequestInfo_IR_OperationDef_exceptions_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::OperationDef *tao_impl
-- ,
+ class TAO_ServerRequestInfo_IR_OperationDef_exceptions_set : public TAO_ServerRequestInfo
+@@ -16884,7 +16726,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::OperationDef *tao_impl
+ ,
- const IR::ExceptionDefSeq & exceptions,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_OperationDef_exceptions_set (const TAO_ServerRequestInfo_IR_OperationDef_exceptions_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_OperationDef_exceptions_set &);
--
--private:
-- POA_IR::OperationDef *_tao_impl;
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -16923,27 +16765,26 @@
+
+ private:
+ POA_IR::OperationDef *_tao_impl;
- const IR::ExceptionDefSeq & exceptions_;
--};
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ const IR_ExceptionDefSeq & exceptions_;
+ };
--#endif /* TAO_HAS_INTERCEPTORS */
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ #endif /* TAO_HAS_INTERCEPTORS */
--};
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
+ };
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Declaration
//
--class _TAO_OperationDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_OperationDef_Proxy_Broker
-+class _TAO_ValueMemberDef_Strategized_Proxy_Broker : public virtual _TAO_ValueMemberDef_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_OperationDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_OperationDef_Proxy_Broker
++class _TAO_OperationDef_Strategized_Proxy_Broker : public virtual _TAO_OperationDef_Proxy_Broker
{
public:
-- _TAO_OperationDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_OperationDef_Strategized_Proxy_Broker (void);
--
+ _TAO_OperationDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_OperationDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_OperationDef_Proxy_Impl &select_proxy (
- ::IR::OperationDef *object,
-+ _TAO_ValueMemberDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_ValueMemberDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_ValueMemberDef_Proxy_Impl &select_proxy (
-+ IR_ValueMemberDef *object,
++ virtual _TAO_OperationDef_Proxy_Impl &select_proxy (
++ IR_OperationDef *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -16961,7 +13437,7 @@
+@@ -16961,7 +16802,7 @@
// 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.
- ::IR::_TAO_OperationDef_Proxy_Impl
-+ _TAO_ValueMemberDef_Proxy_Impl
++ _TAO_OperationDef_Proxy_Impl
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -16970,10 +13446,9 @@
- // interface.
-
- public:
-- static _TAO_OperationDef_Strategized_Proxy_Broker *the_TAO_OperationDef_Strategized_Proxy_Broker (void);
-+ static _TAO_ValueMemberDef_Strategized_Proxy_Broker *the_TAO_ValueMemberDef_Strategized_Proxy_Broker (void);
+@@ -16973,7 +16814,6 @@
+ static _TAO_OperationDef_Strategized_Proxy_Broker *the_TAO_OperationDef_Strategized_Proxy_Broker (void);
};
-
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-@@ -16983,104 +13458,53 @@
+@@ -16983,8 +16823,8 @@
// ThruPOA Impl. Declaration
//
--class _TAO_OperationDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_OperationDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_OperationDef_Proxy_Impl,
-+class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_ValueMemberDef_Proxy_Impl,
++class _TAO_OperationDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_OperationDef_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl,
public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
- {
- public:
-- _TAO_OperationDef_ThruPOA_Proxy_Impl (void);
-+ _TAO_ValueMemberDef_ThruPOA_Proxy_Impl (void);
-
-- virtual ~_TAO_OperationDef_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_ValueMemberDef_ThruPOA_Proxy_Impl (void);
-
-- virtual CORBA::TypeCode_ptr result (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
+@@ -17002,7 +16842,7 @@
+ CORBA::SystemException
+ ));
+
- virtual IR::IDLType_ptr result_def (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- virtual void result_def (
-- CORBA_Object *_collocated_tao_target_,
++ virtual IR_IDLType_ptr result_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -17012,14 +16852,14 @@
+
+ virtual void result_def (
+ CORBA_Object *_collocated_tao_target_,
- IR::IDLType_ptr result_def,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_IDLType_ptr result_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
- virtual IR::ParDescriptionSeq * params (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- virtual void params (
-- CORBA_Object *_collocated_tao_target_,
++ virtual IR_ParDescriptionSeq * params (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -17029,14 +16869,14 @@
+
+ virtual void params (
+ CORBA_Object *_collocated_tao_target_,
- const IR::ParDescriptionSeq & params,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ const IR_ParDescriptionSeq & params,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
- virtual IR::OperationMode mode (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- virtual void mode (
-+ virtual CORBA::TypeCode_ptr type (
++ virtual IR_OperationMode mode (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -17046,14 +16886,14 @@
+
+ virtual void mode (
CORBA_Object *_collocated_tao_target_,
- IR::OperationMode mode,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_OperationMode mode,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual IR::ContextIdSeq * contexts (
-+ virtual IR_IDLType_ptr type_def (
++ virtual IR_ContextIdSeq * contexts (
CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
+@@ -17063,14 +16903,14 @@
-- virtual void contexts (
-+ virtual void type_def (
+ virtual void contexts (
CORBA_Object *_collocated_tao_target_,
- const IR::ContextIdSeq & contexts,
-+ IR_IDLType_ptr type_def,
++ const IR_ContextIdSeq & contexts,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
@@ -27329,2156 +9384,704 @@
));
- virtual IR::ExceptionDefSeq * exceptions (
-+ virtual CORBA::Visibility access (
++ virtual IR_ExceptionDefSeq * exceptions (
CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
+@@ -17080,7 +16920,7 @@
-- virtual void exceptions (
-+ virtual void access (
+ virtual void exceptions (
CORBA_Object *_collocated_tao_target_,
- const IR::ExceptionDefSeq & exceptions,
-+ CORBA::Visibility access,
++ const IR_ExceptionDefSeq & exceptions,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -17094,2326 +13518,1785 @@
+@@ -17094,11 +16934,10 @@
// ThruPOA Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-
#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class OperationDef_tie : public OperationDef
--{
--public:
-- OperationDef_tie (T &t);
-- // the T& ctor
-- OperationDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- OperationDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- OperationDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~OperationDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- CORBA::TypeCode_ptr result (
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export OperationDef_tie : public OperationDef
++ class OperationDef_tie : public OperationDef
+ {
+ public:
+ OperationDef_tie (T &t);
+@@ -17126,7 +16965,7 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class ValueMemberDef_tie : public ValueMemberDef
-+ {
-+ public:
-+ ValueMemberDef_tie (T &t);
-+ // the T& ctor
-+ ValueMemberDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ ValueMemberDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ ValueMemberDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~ValueMemberDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+ CORBA::TypeCode_ptr result (
+@@ -17137,7 +16976,7 @@
+ CORBA::SystemException
+ ));
- IR::IDLType_ptr result_def (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_IDLType_ptr type_def (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void result_def (
++ IR_IDLType_ptr result_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -17146,7 +16985,7 @@
+ ));
+
+ void result_def (
- IR::IDLType_ptr result_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void type_def (
-+ IR_IDLType_ptr type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr result_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -17154,7 +16993,7 @@
+ CORBA::SystemException
+ ));
- IR::ParDescriptionSeq * params (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ CORBA::Visibility access (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void params (
++ IR_ParDescriptionSeq * params (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -17163,7 +17002,7 @@
+ ));
+
+ void params (
- const IR::ParDescriptionSeq & params,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void access (
-+ CORBA::Visibility access,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_ParDescriptionSeq & params,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -17171,7 +17010,7 @@
+ CORBA::SystemException
+ ));
- IR::OperationMode mode (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void mode (
++ IR_OperationMode mode (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -17180,7 +17019,7 @@
+ ));
+
+ void mode (
- IR::OperationMode mode,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_OperationMode mode,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -17188,7 +17027,7 @@
+ CORBA::SystemException
+ ));
- IR::ContextIdSeq * contexts (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void contexts (
++ IR_ContextIdSeq * contexts (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -17197,7 +17036,7 @@
+ ));
+
+ void contexts (
- const IR::ContextIdSeq & contexts,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -17205,7 +17044,7 @@
+ CORBA::SystemException
+ ));
- IR::ExceptionDefSeq * exceptions (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void exceptions (
++ IR_ExceptionDefSeq * exceptions (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -17214,7 +17053,7 @@
+ ));
+
+ void exceptions (
- const IR::ExceptionDefSeq & exceptions,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -17273,7 +17112,7 @@
+ CORBA::SystemException
+ ));
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -17289,7 +17128,7 @@
+ CORBA::SystemException
+ ));
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ // copy and assignment are not allowed
-+ ValueMemberDef_tie (const ValueMemberDef_tie &);
-+ void operator= (const ValueMemberDef_tie &);
-+ };
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -17297,7 +17136,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+#endif /* ACE_HAS_USING_KEYWORD */
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -17306,7 +17145,7 @@
+ ));
-- void move (
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ class ValueDef;
-+ typedef ValueDef *ValueDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-+ class _TAO_ValueDef_Strategized_Proxy_Broker;
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -17316,7 +17155,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ class ValueDef : public virtual Container, public virtual Contained, public virtual IDLType
-+ {
-+ protected:
-+ ValueDef (void);
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ public:
-+ ValueDef (const ValueDef& rhs);
-+ virtual ~ValueDef (void);
-
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- OperationDef_tie (const OperationDef_tie &);
-- void operator= (const OperationDef_tie &);
--};
-
--#endif /* ACE_HAS_USING_KEYWORD */
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--class InterfaceDef;
--typedef InterfaceDef *InterfaceDef_ptr;
--// Forward Classes Declaration
--class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
--class _TAO_InterfaceDef_Strategized_Proxy_Broker;
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
-
--class InterfaceDef : public virtual Container, public virtual Contained, public virtual IDLType
--{
--protected:
-- InterfaceDef (void);
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--public:
-- InterfaceDef (const InterfaceDef& rhs);
-- virtual ~InterfaceDef (void);
-+ static void _non_existent_skel (
-+ 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 ()
-+ );
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+ IR_ValueDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual const char* _interface_repository_id (void) const;
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -17350,7 +17189,7 @@
+ class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
+ class _TAO_InterfaceDef_Strategized_Proxy_Broker;
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_InterfaceDefSeq * supported_interfaces (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- virtual void _dispatch (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_supported_interfaces_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+-class TAO_IFR_Client_Export InterfaceDef : public virtual Container, public virtual Contained, public virtual IDLType
++ class InterfaceDef : public virtual Container, public virtual Contained, public virtual IDLType
+ {
+ protected:
+ InterfaceDef (void);
+@@ -17393,14 +17232,14 @@
+ TAO_default_environment ()
+ );
- ::IR::InterfaceDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void supported_interfaces (
-+ const IR_InterfaceDefSeq & supported_interfaces,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- virtual const char* _interface_repository_id (void) const;
-+ static void _set_supported_interfaces_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ IR_InterfaceDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+
+ virtual const char* _interface_repository_id (void) const;
- virtual IR::InterfaceDefSeq * base_interfaces (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual IR_InitializerSeq * initializers (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void _get_base_interfaces_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_initializers_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual void base_interfaces (
++ virtual IR_InterfaceDefSeq * base_interfaces (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -17417,7 +17256,7 @@
+ );
+
+ virtual void base_interfaces (
- const IR::InterfaceDefSeq & base_interfaces,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual void initializers (
-+ const IR_InitializerSeq & initializers,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void _set_base_interfaces_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_initializers_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual CORBA::Boolean is_abstract (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual IR_ValueDef_ptr base_value (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void _get_is_abstract_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_base_value_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual void is_abstract (
-- CORBA::Boolean is_abstract,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual void base_value (
-+ IR_ValueDef_ptr base_value,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void _set_is_abstract_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_base_value_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual CORBA::Boolean is_local (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual IR_ValueDefSeq * abstract_base_values (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void _get_is_local_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_abstract_base_values_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual void is_local (
-- CORBA::Boolean is_local,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual void abstract_base_values (
-+ const IR_ValueDefSeq & abstract_base_values,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void _set_is_local_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_abstract_base_values_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual CORBA::Boolean is_a (
-- const char * interface_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual CORBA::Boolean is_abstract (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void is_a_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_is_abstract_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -17516,14 +17355,14 @@
+ TAO_default_environment ()
+ );
- virtual IR::AttributeDef_ptr create_attribute (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual void is_abstract (
-+ CORBA::Boolean is_abstract,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void create_attribute_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_is_abstract_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ 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 ()
+ )
+@@ -17539,15 +17378,15 @@
+ TAO_default_environment ()
+ );
- virtual IR::OperationDef_ptr create_operation (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual CORBA::Boolean is_custom (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void create_operation_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_is_custom_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void lookup_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void is_custom (
-+ CORBA::Boolean is_custom,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void contents_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_is_custom_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void lookup_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean is_truncatable (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void describe_contents_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_module_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_is_truncatable_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_constant_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void is_truncatable (
-+ CORBA::Boolean is_truncatable,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void create_struct_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_is_truncatable_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_union_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean is_a (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void create_enum_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void is_a_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_alias_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_ValueMemberDef_ptr create_value_member (
-+ const char * id,
-+ const char * name,
-+ const char * version,
-+ IR_IDLType_ptr type,
-+ CORBA::Visibility access,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void create_interface_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_value_member_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_value_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void create_value_box_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_attribute_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void create_exception_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void create_native_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_operation_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -17567,7 +17406,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void lookup_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void contents_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -17575,7 +17414,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void lookup_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void describe_contents_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -17583,7 +17422,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_module_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_constant_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -17591,7 +17430,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_struct_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -17599,7 +17438,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_union_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -17607,7 +17446,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_enum_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -17615,7 +17454,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_alias_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -17623,7 +17462,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_interface_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_type_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -17631,7 +17470,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_value_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -17639,7 +17478,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_value_box_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -17647,7 +17486,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_exception_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
--
--#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_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::InterfaceDef;
-- TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::InterfaceDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_native_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -17655,7 +17494,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- virtual Dynamic::ParameterList * arguments (
-- CORBA::Environment &ACE_TRY_ENV =
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
-- CORBA::Environment &ACE_TRY_ENV =
-+ );
-+
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-- CORBA::Environment &ACE_TRY_ENV =
-+ );
-+
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -17663,7 +17502,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get (const TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get &);
--
-- private:
-- POA_IR::InterfaceDef *_tao_impl;
-- void result (IR::InterfaceDefSeq * result);
-- // update the result
--IR::InterfaceDefSeq * _result;
--};
-+ );
-+
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_type_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
-+
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Declaration
-+//
-
--class TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set : public TAO_ServerRequestInfo
-+class _TAO_ValueDef_Strategized_Proxy_Broker : public virtual _TAO_ValueDef_Proxy_Broker
- {
--public:
-- friend class POA_IR::InterfaceDef;
-- TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::InterfaceDef *tao_impl
-- ,
-- const IR::InterfaceDefSeq & base_interfaces,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+public:
-+ _TAO_ValueDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_ValueDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_ValueDef_Proxy_Impl &select_proxy (
-+ IR_ValueDef *object,
-+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
- );
+ TAO_default_environment ()
+ );
-- virtual Dynamic::ParameterList * arguments (
+@@ -17671,7 +17510,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -17679,7 +17518,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -17687,7 +17526,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set (const TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set &);
--
- private:
-- POA_IR::InterfaceDef *_tao_impl;
-- const IR::InterfaceDefSeq & base_interfaces_;
--};
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
--class TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::InterfaceDef;
-- TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::InterfaceDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+// 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
- );
+@@ -17695,7 +17534,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- virtual Dynamic::ParameterList * arguments (
+@@ -17703,7 +17542,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
- private:
-- TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get (const TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get &);
-
--private:
-- POA_IR::InterfaceDef *_tao_impl;
-- void result (CORBA::Boolean result);
-- // update the result
--CORBA::Boolean _result;
-+ // 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_ValueDef_Proxy_Impl
-+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-+
-+ TAO_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:
-+ static _TAO_ValueDef_Strategized_Proxy_Broker *the_TAO_ValueDef_Strategized_Proxy_Broker (void);
- };
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
--class TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set : public TAO_ServerRequestInfo
-+//
-+// End Strategized Proxy Broker Declaration
-+///////////////////////////////////////////////////////////////////////
-+
-+
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Impl. Declaration
-+//
-+
-+class _TAO_ValueDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_ValueDef_Proxy_Impl,
-+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
-+
- {
- public:
-- friend class POA_IR::InterfaceDef;
-- TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::InterfaceDef *tao_impl
-- ,
-- 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));
-+ _TAO_ValueDef_ThruPOA_Proxy_Impl (void);
-
-- virtual Dynamic::ExceptionList * exceptions (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
-+ virtual ~_TAO_ValueDef_ThruPOA_Proxy_Impl (void);
-
-- virtual CORBA::Any * result (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual IR_InterfaceDefSeq * supported_interfaces (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set (const TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set &);
--
--private:
-- POA_IR::InterfaceDef *_tao_impl;
-- const CORBA::Boolean & is_abstract_;
--};
--
--class TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::InterfaceDef;
-- TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::InterfaceDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual Dynamic::ParameterList * arguments (
+@@ -17711,7 +17550,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -17719,7 +17558,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- 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));
--
-- virtual Dynamic::ExceptionList * exceptions (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -17727,7 +17566,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -17735,7 +17574,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -17743,7 +17582,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get (const TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get &);
--
--private:
-- POA_IR::InterfaceDef *_tao_impl;
-- void result (CORBA::Boolean result);
-- // update the result
--CORBA::Boolean _result;
--};
--
--class TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::InterfaceDef;
-- TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::InterfaceDef *tao_impl
-- ,
-- const CORBA::Boolean & is_local,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual Dynamic::ParameterList * arguments (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -17751,7 +17590,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -17759,7 +17598,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -17767,7 +17606,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set (const TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set &);
--
--private:
-- POA_IR::InterfaceDef *_tao_impl;
-- const CORBA::Boolean & is_local_;
--};
--
--class TAO_ServerRequestInfo_IR_InterfaceDef_is_a : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::InterfaceDef;
-- TAO_ServerRequestInfo_IR_InterfaceDef_is_a (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::InterfaceDef *tao_impl
-- ,
-- const char * interface_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual Dynamic::ParameterList * arguments (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -17775,7 +17614,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -17783,7 +17622,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -17791,11 +17630,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_InterfaceDef_is_a (const TAO_ServerRequestInfo_IR_InterfaceDef_is_a &);
-- void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_is_a &);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
-
--private:
-- POA_IR::InterfaceDef *_tao_impl;
-- const char * interface_id_;
--void result (CORBA::Boolean result);
-- // update the result
--CORBA::Boolean _result;
--};
--
--class TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::InterfaceDef;
-- TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::InterfaceDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -17849,7 +17687,7 @@
+ POA_IR::InterfaceDef *_tao_impl;
+ void result (IR::InterfaceDefSeq * result);
+ // update the result
+-IR::InterfaceDefSeq * _result;
++ IR_InterfaceDefSeq * _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set : public TAO_ServerRequestInfo
+@@ -17860,7 +17698,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::InterfaceDef *tao_impl
+ ,
+- const IR::InterfaceDefSeq & base_interfaces,
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -17899,7 +17737,7 @@
+
+ private:
+ POA_IR::InterfaceDef *_tao_impl;
+- const IR::InterfaceDefSeq & base_interfaces_;
++ const IR_InterfaceDefSeq & base_interfaces_;
+ };
+
+ class TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get : public TAO_ServerRequestInfo
+@@ -18168,10 +18006,10 @@
+ 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));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute (const TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute &);
-- void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute &);
--
--private:
-- POA_IR::InterfaceDef *_tao_impl;
-- 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 ()
+ );
+@@ -18213,13 +18051,13 @@
+ 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_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_ServerRequestInfo_IR_InterfaceDef_create_operation : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::InterfaceDef;
-- TAO_ServerRequestInfo_IR_InterfaceDef_create_operation (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::InterfaceDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
++ IR_AttributeDef_ptr _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_InterfaceDef_create_operation : public TAO_ServerRequestInfo
+@@ -18233,11 +18071,11 @@
+ 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));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_InterfaceDef_create_operation (const TAO_ServerRequestInfo_IR_InterfaceDef_create_operation &);
-- void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_create_operation &);
--
--private:
-- POA_IR::InterfaceDef *_tao_impl;
-- 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 ()
+ );
+@@ -18279,34 +18117,33 @@
+ 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_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 */
--
--};
--
--
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Declaration
--//
++ IR_OperationDef_ptr _result;
+ };
+
+ #endif /* TAO_HAS_INTERCEPTORS */
+
+ };
+
-
--class _TAO_InterfaceDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_InterfaceDef_Proxy_Broker
--{
--public:
-- _TAO_InterfaceDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_InterfaceDef_Strategized_Proxy_Broker (void);
--
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Declaration
+ //
+
+-class TAO_IFR_Client_Export _TAO_InterfaceDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_InterfaceDef_Proxy_Broker
++class _TAO_InterfaceDef_Strategized_Proxy_Broker : public virtual _TAO_InterfaceDef_Proxy_Broker
+ {
+ public:
+ _TAO_InterfaceDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_InterfaceDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_InterfaceDef_Proxy_Impl &select_proxy (
- ::IR::InterfaceDef *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.
++ virtual _TAO_InterfaceDef_Proxy_Impl &select_proxy (
++ IR_InterfaceDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -18324,7 +18161,7 @@
+ // 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.
- ::IR::_TAO_InterfaceDef_Proxy_Impl
-- *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
--
-- TAO_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:
-- static _TAO_InterfaceDef_Strategized_Proxy_Broker *the_TAO_InterfaceDef_Strategized_Proxy_Broker (void);
--};
--
--
--//
--// End Strategized Proxy Broker Declaration
--///////////////////////////////////////////////////////////////////////
--
--
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Impl. Declaration
--//
++ _TAO_InterfaceDef_Proxy_Impl
+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
+
+ TAO_SYNCH_MUTEX mutex_;
+@@ -18336,7 +18173,6 @@
+ static _TAO_InterfaceDef_Strategized_Proxy_Broker *the_TAO_InterfaceDef_Strategized_Proxy_Broker (void);
+ };
+
-
--class _TAO_InterfaceDef_ThruPOA_Proxy_Impl :
+ //
+ // End Strategized Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -18346,8 +18182,8 @@
+ // ThruPOA Impl. Declaration
+ //
+
+-class TAO_IFR_Client_Export _TAO_InterfaceDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_InterfaceDef_Proxy_Impl,
-- public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
--
--{
--public:
-- _TAO_InterfaceDef_ThruPOA_Proxy_Impl (void);
--
-- virtual ~_TAO_InterfaceDef_ThruPOA_Proxy_Impl (void) { }
--
++class _TAO_InterfaceDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_InterfaceDef_Proxy_Impl,
+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
+ public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl,
+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl,
+@@ -18359,7 +18195,7 @@
+
+ virtual ~_TAO_InterfaceDef_ThruPOA_Proxy_Impl (void) { }
+
- virtual IR::InterfaceDefSeq * base_interfaces (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ virtual IR_InitializerSeq * initializers (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-- virtual void base_interfaces (
-+ virtual void initializers (
- CORBA_Object *_collocated_tao_target_,
-- const IR::InterfaceDefSeq & base_interfaces,
-+ const IR_InitializerSeq & initializers,
- CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-- virtual CORBA::Boolean is_abstract (
-+ virtual IR_ValueDef_ptr base_value (
- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-- virtual void is_abstract (
-+ virtual void base_value (
++ virtual IR_InterfaceDefSeq * base_interfaces (
CORBA_Object *_collocated_tao_target_,
-- CORBA::Boolean is_abstract,
-+ IR_ValueDef_ptr base_value,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-- virtual CORBA::Boolean is_local (
-+ virtual IR_ValueDefSeq * abstract_base_values (
- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
+@@ -18369,7 +18205,7 @@
-- virtual void is_local (
-+ virtual void abstract_base_values (
+ virtual void base_interfaces (
CORBA_Object *_collocated_tao_target_,
-- CORBA::Boolean is_local,
-+ const IR_ValueDefSeq & abstract_base_values,
+- const IR::InterfaceDefSeq & base_interfaces,
++ const IR_InterfaceDefSeq & base_interfaces,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-- virtual CORBA::Boolean is_a (
-+ virtual CORBA::Boolean is_abstract (
- CORBA_Object *_collocated_tao_target_,
-- const char * interface_id,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
+@@ -18419,31 +18255,31 @@
CORBA::SystemException
));
- virtual IR::AttributeDef_ptr create_attribute (
-+ virtual void is_abstract (
++ virtual IR_AttributeDef_ptr create_attribute (
CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
+ 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::Boolean is_abstract,
++ 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 ((
@@ -29486,151 +10089,65 @@
));
- virtual IR::OperationDef_ptr create_operation (
-+ virtual CORBA::Boolean is_custom (
++ virtual IR_OperationDef_ptr create_operation (
CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
+ 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
-+ CORBA::Environment &ACE_TRY_ENV
++ 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
- ));
+@@ -18457,11 +18293,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
--};
--
--
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
-
--
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class InterfaceDef_tie : public InterfaceDef
--{
--public:
-- InterfaceDef_tie (T &t);
-- // the T& ctor
-- InterfaceDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- InterfaceDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- InterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~InterfaceDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export InterfaceDef_tie : public InterfaceDef
++ class InterfaceDef_tie : public InterfaceDef
+ {
+ public:
+ InterfaceDef_tie (T &t);
+@@ -18489,10 +18324,10 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
- IR::InterfaceDefSeq * base_interfaces (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void base_interfaces (
-- const IR::InterfaceDefSeq & base_interfaces,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- CORBA::Boolean is_abstract (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual void is_custom (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Boolean is_custom,
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-- void is_abstract (
-- CORBA::Boolean is_abstract,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual CORBA::Boolean is_truncatable (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-- CORBA::Boolean is_local (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual void is_truncatable (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Boolean is_truncatable,
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-- void is_local (
-- CORBA::Boolean is_local,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual CORBA::Boolean is_a (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_InterfaceDefSeq * base_interfaces (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
+@@ -18501,7 +18336,7 @@
));
-- CORBA::Boolean is_a (
-- const char * interface_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ 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
+ void base_interfaces (
+- const IR::InterfaceDefSeq & base_interfaces,
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -18552,14 +18387,14 @@
CORBA::SystemException
));
- IR::AttributeDef_ptr create_attribute (
-+ virtual IR_AttributeDef_ptr create_attribute (
-+ CORBA_Object *_collocated_tao_target_,
++ IR_AttributeDef_ptr create_attribute (
const char * id,
const char * name,
const char * version,
@@ -29638,21 +10155,19 @@
- IR::AttributeMode mode,
- const IR::ExceptionDefSeq & get_exceptions,
- const IR::ExceptionDefSeq & put_exceptions,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ IR_IDLType_ptr type,
-+ IR_AttributeMode mode,
-+ const IR_ExceptionDefSeq & get_exceptions,
-+ const IR_ExceptionDefSeq & put_exceptions,
-+ CORBA::Environment &ACE_TRY_ENV
++ 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 ()
)
- ACE_THROW_SPEC ((
+@@ -18567,15 +18402,15 @@
CORBA::SystemException
));
- IR::OperationDef_ptr create_operation (
-+ virtual IR_OperationDef_ptr create_operation (
-+ CORBA_Object *_collocated_tao_target_,
++ IR_OperationDef_ptr create_operation (
const char * id,
const char * name,
const char * version,
@@ -29661,4528 +10176,1276 @@
- const IR::ParDescriptionSeq & params,
- const IR::ExceptionDefSeq & exceptions,
- const IR::ContextIdSeq & contexts,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_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
++ 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 ()
)
- ACE_THROW_SPEC ((
+@@ -18583,7 +18418,7 @@
CORBA::SystemException
));
- IR::Contained_ptr lookup (
-- const char * search_name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+};
++ IR_Contained_ptr lookup (
+ const char * search_name,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -18592,8 +18427,8 @@
+ CORBA::SystemException
+ ));
- IR::ContainedSeq * contents (
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
++ IR_ContainedSeq * contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -18602,10 +18437,10 @@
+ CORBA::SystemException
+ ));
- IR::ContainedSeq * lookup_name (
-- const char * search_name,
-- CORBA::Long levels_to_search,
++ IR_ContainedSeq * lookup_name (
+ const char * search_name,
+ CORBA::Long levels_to_search,
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -18614,8 +18449,8 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class ValueDef_tie : public ValueDef
-+ {
-+ public:
-+ ValueDef_tie (T &t);
-+ // the T& ctor
-+ ValueDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ ValueDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ ValueDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~ValueDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ IR_InterfaceDefSeq * supported_interfaces (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Container::DescriptionSeq * describe_contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Long max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -18625,7 +18460,7 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
-+ void supported_interfaces (
-+ const IR_InterfaceDefSeq & supported_interfaces,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_ModuleDef_ptr create_module (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -18636,11 +18471,11 @@
+ CORBA::SystemException
+ ));
- IR::ConstantDef_ptr create_constant (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ IR_InitializerSeq * initializers (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr type,
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -18649,11 +18484,11 @@
+ CORBA::SystemException
+ ));
- IR::StructDef_ptr create_struct (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ void initializers (
-+ const IR_InitializerSeq & initializers,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18661,12 +18496,12 @@
+ CORBA::SystemException
+ ));
- IR::UnionDef_ptr create_union (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ IR_ValueDef_ptr base_value (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr discriminator_type,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18674,11 +18509,11 @@
+ CORBA::SystemException
+ ));
- IR::EnumDef_ptr create_enum (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ void base_value (
-+ IR_ValueDef_ptr base_value,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18686,11 +18521,11 @@
+ CORBA::SystemException
+ ));
- IR::AliasDef_ptr create_alias (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ IR_ValueDefSeq * abstract_base_values (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr original_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18698,11 +18533,11 @@
+ CORBA::SystemException
+ ));
- IR::InterfaceDef_ptr create_interface (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ void abstract_base_values (
-+ const IR_ValueDefSeq & abstract_base_values,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -18712,17 +18547,17 @@
+ CORBA::SystemException
+ ));
- 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 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,
++ 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
-- ));
-+ CORBA::Boolean is_abstract (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_ValueDefSeq & abstract_base_values,
++ const IR_InterfaceDefSeq & supported_interfaces,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18730,11 +18565,11 @@
+ CORBA::SystemException
+ ));
- IR::ValueBoxDef_ptr create_value_box (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ void is_abstract (
-+ CORBA::Boolean is_abstract,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18742,11 +18577,11 @@
+ CORBA::SystemException
+ ));
- IR::ExceptionDef_ptr create_exception (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ CORBA::Boolean is_custom (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18754,7 +18589,7 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
-+ void is_custom (
-+ CORBA::Boolean is_custom,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ CORBA::Boolean is_truncatable (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void is_truncatable (
-+ CORBA::Boolean is_truncatable,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ CORBA::Boolean is_a (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_ValueMemberDef_ptr create_value_member (
-+ const char * id,
-+ const char * name,
-+ const char * version,
-+ IR_IDLType_ptr type,
-+ CORBA::Visibility access,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_NativeDef_ptr create_native (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -18816,7 +18651,7 @@
+ CORBA::SystemException
+ ));
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_Contained_ptr lookup (
-+ const char * search_name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18832,7 +18667,7 @@
+ CORBA::SystemException
+ ));
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_ContainedSeq * contents (
-+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18840,7 +18675,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_ContainedSeq * lookup_name (
-+ const char * search_name,
-+ CORBA::Long levels_to_search,
-+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void move (
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18849,7 +18684,7 @@
+ ));
+
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
-
-- CORBA::TypeCode_ptr type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -18867,7 +18702,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ 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
-+ ));
-
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- InterfaceDef_tie (const InterfaceDef_tie &);
-- void operator= (const InterfaceDef_tie &);
--};
-+ 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
-+ ));
-
--#endif /* ACE_HAS_USING_KEYWORD */
-+ 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
-+ ));
-
--class ValueMemberDef;
--typedef ValueMemberDef *ValueMemberDef_ptr;
--// Forward Classes Declaration
--class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
--class _TAO_ValueMemberDef_Strategized_Proxy_Broker;
-+ 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
-+ ));
-
--class ValueMemberDef : public virtual Contained
--{
--protected:
-- ValueMemberDef (void);
-+ 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
-+ ));
-
--public:
-- ValueMemberDef (const ValueMemberDef& rhs);
-- virtual ~ValueMemberDef (void);
-+ 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
-+ ));
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18901,7 +18736,7 @@
+ class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
+ class _TAO_ValueMemberDef_Strategized_Proxy_Broker;
-+ 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 CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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 void* _downcast (
-- const char* logical_type_id
-- );
-+ 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
-+ ));
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void _dispatch (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+-class TAO_IFR_Client_Export ValueMemberDef : public virtual Contained
++ class ValueMemberDef : public virtual Contained
+ {
+ protected:
+ ValueMemberDef (void);
+@@ -18944,7 +18779,7 @@
+ TAO_default_environment ()
+ );
- ::IR::ValueMemberDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual const char* _interface_repository_id (void) const;
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual CORBA::TypeCode_ptr type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_type_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_ValueMemberDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -18967,7 +18802,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::IDLType_ptr type_def (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_type_def_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void type_def (
++ virtual IR_IDLType_ptr type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18984,7 +18819,7 @@
+ );
+
+ virtual void type_def (
- IR::IDLType_ptr type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_type_def_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual CORBA::Visibility access (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_access_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void access (
-- CORBA::Visibility access,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_access_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -19037,7 +18872,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -19045,7 +18880,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ // copy and assignment are not allowed
-+ ValueDef_tie (const ValueDef_tie &);
-+ void operator= (const ValueDef_tie &);
-+ };
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -19053,7 +18888,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+#endif /* ACE_HAS_USING_KEYWORD */
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -19061,7 +18896,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class ValueBoxDef;
-+ typedef ValueBoxDef *ValueBoxDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl;
-+ class _TAO_ValueBoxDef_Strategized_Proxy_Broker;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -19069,7 +18904,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class ValueBoxDef : public virtual TypedefDef
-+ {
-+ protected:
-+ ValueBoxDef (void);
-
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ public:
-+ ValueBoxDef (const ValueBoxDef& rhs);
-+ virtual ~ValueBoxDef (void);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
+@@ -19077,7 +18912,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -19085,7 +18920,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -19093,7 +18928,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -19101,7 +18936,7 @@
+ 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 ()
-+ );
-
-- static void _get_def_kind_skel (
-- 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 ()
-+ );
-
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_ValueBoxDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--
--#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_ServerRequestInfo_IR_ValueMemberDef_type_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::ValueMemberDef;
-- TAO_ServerRequestInfo_IR_ValueMemberDef_type_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueMemberDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual const char* _interface_repository_id (void) const;
-
-- virtual Dynamic::ParameterList * arguments (
-+ virtual IR_IDLType_ptr original_type_def (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-+
-+ static void _get_original_type_def_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-+ );
-+
-+ virtual void original_type_def (
-+ IR_IDLType_ptr original_type_def,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_ValueMemberDef_type_get (const TAO_ServerRequestInfo_IR_ValueMemberDef_type_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueMemberDef_type_get &);
--
-- private:
-- POA_IR::ValueMemberDef *_tao_impl;
-- void result (CORBA::TypeCode_ptr result);
-- // update the result
--CORBA::TypeCode_ptr _result;
--};
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
--class TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ValueMemberDef;
-- TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueMemberDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_original_type_def_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ 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 (
+@@ -19109,7 +18944,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get (const TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get &);
--
--private:
-- POA_IR::ValueMemberDef *_tao_impl;
-- void result (IR::IDLType_ptr result);
-- // update the result
--IR::IDLType_ptr _result;
--};
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
--class TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ValueMemberDef;
-- TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueMemberDef *tao_impl
-- ,
-- IR::IDLType_ptr type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -19117,7 +18952,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- virtual Dynamic::ParameterList * arguments (
+@@ -19125,7 +18960,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set (const TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set &);
--
--private:
-- POA_IR::ValueMemberDef *_tao_impl;
-- IR::IDLType_ptr type_def_;
--};
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
--class TAO_ServerRequestInfo_IR_ValueMemberDef_access_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ValueMemberDef;
-- TAO_ServerRequestInfo_IR_ValueMemberDef_access_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueMemberDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- virtual Dynamic::ParameterList * arguments (
+@@ -19133,11 +18968,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ValueMemberDef_access_get (const TAO_ServerRequestInfo_IR_ValueMemberDef_access_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueMemberDef_access_get &);
--
--private:
-- POA_IR::ValueMemberDef *_tao_impl;
-- void result (CORBA::Visibility result);
-- // update the result
--CORBA::Visibility _result;
--};
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
--class TAO_ServerRequestInfo_IR_ValueMemberDef_access_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ValueMemberDef;
-- TAO_ServerRequestInfo_IR_ValueMemberDef_access_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueMemberDef *tao_impl
-- ,
-- const CORBA::Visibility & access,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ValueMemberDef_access_set (const TAO_ServerRequestInfo_IR_ValueMemberDef_access_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueMemberDef_access_set &);
--
--private:
-- POA_IR::ValueMemberDef *_tao_impl;
-- const CORBA::Visibility & access_;
--};
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -19242,7 +19076,7 @@
+ POA_IR::ValueMemberDef *_tao_impl;
+ void result (IR::IDLType_ptr result);
+ // update the result
+-IR::IDLType_ptr _result;
++ IR_IDLType_ptr _result;
+ };
--#endif /* TAO_HAS_INTERCEPTORS */
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ class TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set : public TAO_ServerRequestInfo
+@@ -19253,7 +19087,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::ValueMemberDef *tao_impl
+ ,
+- IR::IDLType_ptr type_def,
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -19292,7 +19126,7 @@
+
+ private:
+ POA_IR::ValueMemberDef *_tao_impl;
+- IR::IDLType_ptr type_def_;
++ IR_IDLType_ptr type_def_;
+ };
--};
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_type_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
+ class TAO_ServerRequestInfo_IR_ValueMemberDef_access_get : public TAO_ServerRequestInfo
+@@ -19400,20 +19234,19 @@
+
+ };
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Declaration
//
--class _TAO_ValueMemberDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ValueMemberDef_Proxy_Broker
-+class _TAO_ValueBoxDef_Strategized_Proxy_Broker : public virtual _TAO_ValueBoxDef_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_ValueMemberDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ValueMemberDef_Proxy_Broker
++class _TAO_ValueMemberDef_Strategized_Proxy_Broker : public virtual _TAO_ValueMemberDef_Proxy_Broker
{
public:
-- _TAO_ValueMemberDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_ValueMemberDef_Strategized_Proxy_Broker (void);
--
+ _TAO_ValueMemberDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_ValueMemberDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_ValueMemberDef_Proxy_Impl &select_proxy (
- ::IR::ValueMemberDef *object,
-+ _TAO_ValueBoxDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_ValueBoxDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_ValueBoxDef_Proxy_Impl &select_proxy (
-+ IR_ValueBoxDef *object,
++ virtual _TAO_ValueMemberDef_Proxy_Impl &select_proxy (
++ IR_ValueMemberDef *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -19431,7 +15314,7 @@
+@@ -19431,7 +19264,7 @@
// 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.
- ::IR::_TAO_ValueMemberDef_Proxy_Impl
-+ _TAO_ValueBoxDef_Proxy_Impl
++ _TAO_ValueMemberDef_Proxy_Impl
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -19440,10 +15323,9 @@
- // interface.
-
- public:
-- static _TAO_ValueMemberDef_Strategized_Proxy_Broker *the_TAO_ValueMemberDef_Strategized_Proxy_Broker (void);
-+ static _TAO_ValueBoxDef_Strategized_Proxy_Broker *the_TAO_ValueBoxDef_Strategized_Proxy_Broker (void);
+@@ -19443,7 +19276,6 @@
+ static _TAO_ValueMemberDef_Strategized_Proxy_Broker *the_TAO_ValueMemberDef_Strategized_Proxy_Broker (void);
};
-
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-@@ -19453,53 +15335,28 @@
+@@ -19453,8 +19285,8 @@
// ThruPOA Impl. Declaration
//
--class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_ValueMemberDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_ValueMemberDef_Proxy_Impl,
-+class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_ValueBoxDef_Proxy_Impl,
++class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_ValueMemberDef_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-+ public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl
-
- {
- public:
-- _TAO_ValueMemberDef_ThruPOA_Proxy_Impl (void);
-+ _TAO_ValueBoxDef_ThruPOA_Proxy_Impl (void);
-
-- virtual ~_TAO_ValueMemberDef_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_ValueBoxDef_ThruPOA_Proxy_Impl (void);
+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-- virtual CORBA::TypeCode_ptr type (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
+@@ -19472,7 +19304,7 @@
+ CORBA::SystemException
+ ));
+
- virtual IR::IDLType_ptr type_def (
-- 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
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- virtual CORBA::Visibility access (
-+ virtual IR_IDLType_ptr original_type_def (
++ virtual IR_IDLType_ptr type_def (
CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
+@@ -19482,7 +19314,7 @@
-- virtual void access (
-+ virtual void original_type_def (
+ virtual void type_def (
CORBA_Object *_collocated_tao_target_,
-- CORBA::Visibility access,
-+ IR_IDLType_ptr original_type_def,
+- IR::IDLType_ptr type_def,
++ IR_IDLType_ptr type_def,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -19513,1786 +15370,1262 @@
+@@ -19513,11 +19345,10 @@
// ThruPOA Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-
#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class ValueMemberDef_tie : public ValueMemberDef
--{
--public:
-- ValueMemberDef_tie (T &t);
-- // the T& ctor
-- ValueMemberDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- ValueMemberDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- ValueMemberDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~ValueMemberDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- CORBA::TypeCode_ptr type (
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export ValueMemberDef_tie : public ValueMemberDef
++ class ValueMemberDef_tie : public ValueMemberDef
+ {
+ public:
+ ValueMemberDef_tie (T &t);
+@@ -19545,7 +19376,7 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class ValueBoxDef_tie : public ValueBoxDef
-+ {
-+ public:
-+ ValueBoxDef_tie (T &t);
-+ // the T& ctor
-+ ValueBoxDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ ValueBoxDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ ValueBoxDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~ValueBoxDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ IR_IDLType_ptr original_type_def (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+ CORBA::TypeCode_ptr type (
+@@ -19556,7 +19387,7 @@
+ CORBA::SystemException
+ ));
- IR::IDLType_ptr type_def (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void original_type_def (
-+ IR_IDLType_ptr original_type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void type_def (
++ IR_IDLType_ptr type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -19565,7 +19396,7 @@
+ ));
+
+ void type_def (
- IR::IDLType_ptr type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- CORBA::Visibility access (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void access (
-- CORBA::Visibility access,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -19641,7 +19472,7 @@
+ CORBA::SystemException
+ ));
+
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -19657,7 +19488,7 @@
+ CORBA::SystemException
+ ));
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -19665,7 +19496,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void move (
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -19674,7 +19505,7 @@
+ ));
+
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -19684,7 +19515,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
- private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- ValueMemberDef_tie (const ValueMemberDef_tie &);
-- void operator= (const ValueMemberDef_tie &);
--};
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-
--#endif /* ACE_HAS_USING_KEYWORD */
-+ // copy and assignment are not allowed
-+ ValueBoxDef_tie (const ValueBoxDef_tie &);
-+ void operator= (const ValueBoxDef_tie &);
-+ };
-
--class ValueDef;
--typedef ValueDef *ValueDef_ptr;
--// Forward Classes Declaration
--class _TAO_ValueDef_ThruPOA_Proxy_Impl;
--class _TAO_ValueDef_Strategized_Proxy_Broker;
-+#endif /* ACE_HAS_USING_KEYWORD */
-
--class ValueDef : public virtual Container, public virtual Contained, public virtual IDLType
--{
--protected:
-- ValueDef (void);
-+ class ProvidesDef;
-+ typedef ProvidesDef *ProvidesDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
-+ class _TAO_ProvidesDef_Strategized_Proxy_Broker;
-
--public:
-- ValueDef (const ValueDef& rhs);
-- virtual ~ValueDef (void);
-+ class ProvidesDef : public virtual Contained
-+ {
-+ protected:
-+ ProvidesDef (void);
-
-+ public:
-+ ProvidesDef (const ProvidesDef& rhs);
-+ virtual ~ProvidesDef (void);
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -19718,7 +19549,7 @@
+ class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+ class _TAO_ValueDef_Strategized_Proxy_Broker;
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
-
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _is_a_skel (
-+ 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 ()
-- );
-+ static void _non_existent_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+-class TAO_IFR_Client_Export ValueDef : public virtual Container, public virtual Contained, public virtual IDLType
++ class ValueDef : public virtual Container, public virtual Contained, public virtual IDLType
+ {
+ protected:
+ ValueDef (void);
+@@ -19761,14 +19592,14 @@
+ TAO_default_environment ()
+ );
- ::IR::ValueDef *_this (
-- 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 ()
-+ );
-
-- virtual const char* _interface_repository_id (void) const;
-+ IR_ProvidesDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ IR_ValueDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+
+ virtual const char* _interface_repository_id (void) const;
- virtual IR::InterfaceDefSeq * supported_interfaces (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual const char* _interface_repository_id (void) const;
++ virtual IR_InterfaceDefSeq * supported_interfaces (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -19785,7 +19616,7 @@
+ );
-- static void _get_supported_interfaces_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_InterfaceDef_ptr interface_type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- virtual void supported_interfaces (
+ virtual void supported_interfaces (
- const IR::InterfaceDefSeq & supported_interfaces,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _get_interface_type_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_supported_interfaces_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -19801,7 +19632,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::InitializerSeq * initializers (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_initializers_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ virtual IR_InitializerSeq * initializers (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -19818,7 +19649,7 @@
+ );
-- virtual void initializers (
+ virtual void initializers (
- const IR::InitializerSeq & initializers,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_initializers_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -19834,7 +19665,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::ValueDef_ptr base_value (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_base_value_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ virtual IR_ValueDef_ptr base_value (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -19851,7 +19682,7 @@
+ );
-- virtual void base_value (
+ virtual void base_value (
- IR::ValueDef_ptr base_value,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_base_value_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_ValueDef_ptr base_value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -19867,7 +19698,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::ValueDefSeq * abstract_base_values (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
-- static void _get_abstract_base_values_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ virtual IR_ValueDefSeq * abstract_base_values (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -19884,7 +19715,7 @@
+ );
-- virtual void abstract_base_values (
+ virtual void abstract_base_values (
- const IR::ValueDefSeq & abstract_base_values,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_abstract_base_values_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- virtual CORBA::Boolean is_abstract (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
-
-- static void _get_is_abstract_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Declaration
-+//
-
-- virtual void is_abstract (
-- CORBA::Boolean is_abstract,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+class _TAO_ProvidesDef_Strategized_Proxy_Broker : public virtual _TAO_ProvidesDef_Proxy_Broker
-+{
-+public:
-+ _TAO_ProvidesDef_Strategized_Proxy_Broker (void);
-
-- static void _set_is_abstract_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual ~_TAO_ProvidesDef_Strategized_Proxy_Broker (void);
-
-- virtual CORBA::Boolean is_custom (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy (
-+ IR_ProvidesDef *object,
-+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-+ );
-
-- static void _get_is_custom_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+private:
-
-- virtual void is_custom (
-- CORBA::Boolean is_custom,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+// 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
-+ );
-
-- static void _set_is_custom_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+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_ProvidesDef_Proxy_Impl
-+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-+
-+ TAO_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.
-
-- virtual CORBA::Boolean is_truncatable (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+public:
-+ static _TAO_ProvidesDef_Strategized_Proxy_Broker *the_TAO_ProvidesDef_Strategized_Proxy_Broker (void);
-+};
-
-- static void _get_is_truncatable_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+//
-+// End Strategized Proxy Broker Declaration
-+///////////////////////////////////////////////////////////////////////
-
-- virtual void is_truncatable (
-- CORBA::Boolean is_truncatable,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-
-- static void _set_is_truncatable_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Impl. Declaration
-+//
-
-- virtual CORBA::Boolean is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+class _TAO_ProvidesDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_ProvidesDef_Proxy_Impl,
-+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-+
-+{
-+public:
-+ _TAO_ProvidesDef_ThruPOA_Proxy_Impl (void);
-+
-+ virtual ~_TAO_ProvidesDef_ThruPOA_Proxy_Impl (void);
-+
-+ virtual IR_InterfaceDef_ptr interface_type (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
++ const IR_ValueDefSeq & abstract_base_values,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
-- )) = 0;
--
-- static void is_a_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ ));
+@@ -20016,11 +19847,11 @@
+ TAO_default_environment ()
+ );
- virtual IR::ValueMemberDef_ptr create_value_member (
-- const char * id,
-- const char * name,
-- const char * version,
++ virtual IR_ValueMemberDef_ptr create_value_member (
+ const char * id,
+ const char * name,
+ const char * version,
- IR::IDLType_ptr type,
-- CORBA::Visibility access,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+};
-
-- static void create_value_member_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ IR_IDLType_ptr type,
+ CORBA::Visibility access,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -20037,14 +19868,14 @@
+ TAO_default_environment ()
+ );
- virtual IR::AttributeDef_ptr create_attribute (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
-
-- static void create_attribute_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class ProvidesDef_tie : public ProvidesDef
-+ {
-+ public:
-+ ProvidesDef_tie (T &t);
-+ // the T& ctor
-+ ProvidesDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ ProvidesDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ ProvidesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~ProvidesDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ IR_InterfaceDef_ptr interface_type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ 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 ()
+ )
+@@ -20060,15 +19891,15 @@
+ TAO_default_environment ()
+ );
- virtual IR::OperationDef_ptr create_operation (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_operation_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void lookup_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ 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 ()
+ )
+@@ -20088,7 +19919,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void contents_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -20096,7 +19927,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void lookup_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -20104,7 +19935,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void describe_contents_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -20112,7 +19943,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_module_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -20120,7 +19951,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_constant_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -20128,7 +19959,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_struct_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -20136,7 +19967,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_union_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -20144,7 +19975,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_enum_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -20152,7 +19983,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_alias_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -20160,7 +19991,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_interface_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -20168,7 +19999,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_value_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -20176,7 +20007,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_value_box_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -20184,7 +20015,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_exception_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -20192,7 +20023,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_native_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -20200,7 +20031,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -20208,7 +20039,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -20216,7 +20047,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -20224,7 +20055,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ // copy and assignment are not allowed
-+ ProvidesDef_tie (const ProvidesDef_tie &);
-+ void operator= (const ProvidesDef_tie &);
-+ };
-
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -20232,7 +20063,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+#endif /* ACE_HAS_USING_KEYWORD */
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -20240,7 +20071,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class UsesDef;
-+ typedef UsesDef *UsesDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_UsesDef_ThruPOA_Proxy_Impl;
-+ class _TAO_UsesDef_Strategized_Proxy_Broker;
-
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -20248,7 +20079,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class UsesDef : public virtual Contained
-+ {
-+ protected:
-+ UsesDef (void);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -20256,7 +20087,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ public:
-+ UsesDef (const UsesDef& rhs);
-+ virtual ~UsesDef (void);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -20264,7 +20095,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -20272,7 +20103,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -20280,7 +20111,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -20288,7 +20119,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_type_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -20296,7 +20127,7 @@
+ 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 ()
-+ );
-
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -20304,7 +20135,7 @@
+ 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 ()
-+ );
-
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -20312,11 +20143,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_UsesDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-
--#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_ServerRequestInfo_IR_ValueDef_supported_interfaces_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::ValueDef;
-- TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual const char* _interface_repository_id (void) const;
-
-- virtual Dynamic::ParameterList * arguments (
-+ virtual IR_InterfaceDef_ptr interface_type (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-+
-+ static void _get_interface_type_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-+ );
-+
-+ virtual CORBA::Boolean is_multiple (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get (const TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get &);
--
-- private:
-- POA_IR::ValueDef *_tao_impl;
-- void result (IR::InterfaceDefSeq * result);
-- // update the result
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -20370,7 +20200,7 @@
+ POA_IR::ValueDef *_tao_impl;
+ void result (IR::InterfaceDefSeq * result);
+ // update the result
-IR::InterfaceDefSeq * _result;
--};
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ IR_InterfaceDefSeq * _result;
+ };
--class TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ValueDef;
-- TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
+ class TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set : public TAO_ServerRequestInfo
+@@ -20381,7 +20211,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::ValueDef *tao_impl
+ ,
- const IR::InterfaceDefSeq & supported_interfaces,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_is_multiple_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set (const TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set &);
--
--private:
-- POA_IR::ValueDef *_tao_impl;
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -20420,7 +20250,7 @@
+
+ private:
+ POA_IR::ValueDef *_tao_impl;
- const IR::InterfaceDefSeq & supported_interfaces_;
--};
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ const IR_InterfaceDefSeq & supported_interfaces_;
+ };
--class TAO_ServerRequestInfo_IR_ValueDef_initializers_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ValueDef;
-- TAO_ServerRequestInfo_IR_ValueDef_initializers_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ValueDef_initializers_get (const TAO_ServerRequestInfo_IR_ValueDef_initializers_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueDef_initializers_get &);
--
--private:
-- POA_IR::ValueDef *_tao_impl;
-- void result (IR::InitializerSeq * result);
-- // update the result
+ class TAO_ServerRequestInfo_IR_ValueDef_initializers_get : public TAO_ServerRequestInfo
+@@ -20471,7 +20301,7 @@
+ POA_IR::ValueDef *_tao_impl;
+ void result (IR::InitializerSeq * result);
+ // update the result
-IR::InitializerSeq * _result;
--};
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_InitializerSeq * _result;
+ };
--class TAO_ServerRequestInfo_IR_ValueDef_initializers_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ValueDef;
-- TAO_ServerRequestInfo_IR_ValueDef_initializers_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
+ class TAO_ServerRequestInfo_IR_ValueDef_initializers_set : public TAO_ServerRequestInfo
+@@ -20482,7 +20312,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::ValueDef *tao_impl
+ ,
- const IR::InitializerSeq & initializers,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ValueDef_initializers_set (const TAO_ServerRequestInfo_IR_ValueDef_initializers_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueDef_initializers_set &);
--
--private:
-- POA_IR::ValueDef *_tao_impl;
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -20521,7 +20351,7 @@
+
+ private:
+ POA_IR::ValueDef *_tao_impl;
- const IR::InitializerSeq & initializers_;
--};
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ const IR_InitializerSeq & initializers_;
+ };
--class TAO_ServerRequestInfo_IR_ValueDef_base_value_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ValueDef;
-- TAO_ServerRequestInfo_IR_ValueDef_base_value_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ValueDef_base_value_get (const TAO_ServerRequestInfo_IR_ValueDef_base_value_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueDef_base_value_get &);
--
--private:
-- POA_IR::ValueDef *_tao_impl;
-- void result (IR::ValueDef_ptr result);
-- // update the result
+ class TAO_ServerRequestInfo_IR_ValueDef_base_value_get : public TAO_ServerRequestInfo
+@@ -20572,7 +20402,7 @@
+ POA_IR::ValueDef *_tao_impl;
+ void result (IR::ValueDef_ptr result);
+ // update the result
-IR::ValueDef_ptr _result;
--};
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
-+
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Declaration
-+//
-
--class TAO_ServerRequestInfo_IR_ValueDef_base_value_set : public TAO_ServerRequestInfo
-+class _TAO_UsesDef_Strategized_Proxy_Broker : public virtual _TAO_UsesDef_Proxy_Broker
- {
--public:
-- friend class POA_IR::ValueDef;
-- TAO_ServerRequestInfo_IR_ValueDef_base_value_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
++ IR_ValueDef_ptr _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_ValueDef_base_value_set : public TAO_ServerRequestInfo
+@@ -20583,7 +20413,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::ValueDef *tao_impl
+ ,
- IR::ValueDef_ptr base_value,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+public:
-+ _TAO_UsesDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_UsesDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_UsesDef_Proxy_Impl &select_proxy (
-+ IR_UsesDef *object,
-+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
++ 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));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ValueDef_base_value_set (const TAO_ServerRequestInfo_IR_ValueDef_base_value_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueDef_base_value_set &);
--
+@@ -20622,7 +20452,7 @@
+
private:
-- POA_IR::ValueDef *_tao_impl;
+ POA_IR::ValueDef *_tao_impl;
- IR::ValueDef_ptr base_value_;
--};
-
--class TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ValueDef;
-- TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+// 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
- );
++ IR_ValueDef_ptr base_value_;
+ };
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
- private:
-- TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get (const TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get &);
-
--private:
-- POA_IR::ValueDef *_tao_impl;
-- void result (IR::ValueDefSeq * result);
-- // update the result
+ class TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get : public TAO_ServerRequestInfo
+@@ -20673,7 +20503,7 @@
+ POA_IR::ValueDef *_tao_impl;
+ void result (IR::ValueDefSeq * result);
+ // update the result
-IR::ValueDefSeq * _result;
-+ // 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_UsesDef_Proxy_Impl
-+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-+
-+ TAO_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:
-+ static _TAO_UsesDef_Strategized_Proxy_Broker *the_TAO_UsesDef_Strategized_Proxy_Broker (void);
++ IR_ValueDefSeq * _result;
};
--class TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set : public TAO_ServerRequestInfo
-+//
-+// End Strategized Proxy Broker Declaration
-+///////////////////////////////////////////////////////////////////////
-+
-+
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Impl. Declaration
-+//
-+
-+class _TAO_UsesDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_UsesDef_Proxy_Impl,
-+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-+
- {
- public:
-- friend class POA_IR::ValueDef;
-- TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
+ class TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set : public TAO_ServerRequestInfo
+@@ -20684,7 +20514,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::ValueDef *tao_impl
+ ,
- 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));
-+ _TAO_UsesDef_ThruPOA_Proxy_Impl (void);
-
-- virtual Dynamic::ExceptionList * exceptions (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
-+ virtual ~_TAO_UsesDef_ThruPOA_Proxy_Impl (void);
++ const IR_ValueDefSeq & abstract_base_values,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -20723,7 +20553,7 @@
-- virtual CORBA::Any * result (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual IR_InterfaceDef_ptr interface_type (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set (const TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set &);
--
--private:
-- POA_IR::ValueDef *_tao_impl;
+ private:
+ POA_IR::ValueDef *_tao_impl;
- const IR::ValueDefSeq & abstract_base_values_;
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ virtual CORBA::Boolean is_multiple (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
++ const IR_ValueDefSeq & abstract_base_values_;
};
--class TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ValueDef;
-- TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get (const TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get &);
--
--private:
-- POA_IR::ValueDef *_tao_impl;
-- void result (CORBA::Boolean result);
-- // update the result
--CORBA::Boolean _result;
--};
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
-
--class TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ValueDef;
-- TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- const CORBA::Boolean & is_abstract,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class UsesDef_tie : public UsesDef
-+ {
-+ public:
-+ UsesDef_tie (T &t);
-+ // the T& ctor
-+ UsesDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ UsesDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ UsesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~UsesDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ IR_InterfaceDef_ptr interface_type (
-+ 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 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set (const TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set &);
--
--private:
-- POA_IR::ValueDef *_tao_impl;
-- const CORBA::Boolean & is_abstract_;
--};
-+ CORBA::Boolean is_multiple (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class TAO_ServerRequestInfo_IR_ValueDef_is_custom_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ValueDef;
-- TAO_ServerRequestInfo_IR_ValueDef_is_custom_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * id (
-+ 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 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ValueDef_is_custom_get (const TAO_ServerRequestInfo_IR_ValueDef_is_custom_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueDef_is_custom_get &);
--
--private:
-- POA_IR::ValueDef *_tao_impl;
-- void result (CORBA::Boolean result);
-- // update the result
--CORBA::Boolean _result;
--};
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class TAO_ServerRequestInfo_IR_ValueDef_is_custom_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ValueDef;
-- TAO_ServerRequestInfo_IR_ValueDef_is_custom_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- const CORBA::Boolean & is_custom,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * name (
-+ 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 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ValueDef_is_custom_set (const TAO_ServerRequestInfo_IR_ValueDef_is_custom_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueDef_is_custom_set &);
--
--private:
-- POA_IR::ValueDef *_tao_impl;
-- const CORBA::Boolean & is_custom_;
--};
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ValueDef;
-- TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * version (
-+ 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 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get (const TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get &);
--
--private:
-- POA_IR::ValueDef *_tao_impl;
-- void result (CORBA::Boolean result);
-- // update the result
--CORBA::Boolean _result;
--};
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ValueDef;
-- TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- const CORBA::Boolean & is_truncatable,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Container_ptr defined_in (
-+ 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 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set (const TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set &);
--
--private:
-- POA_IR::ValueDef *_tao_impl;
-- const CORBA::Boolean & is_truncatable_;
--};
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class TAO_ServerRequestInfo_IR_ValueDef_is_a : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ValueDef;
-- TAO_ServerRequestInfo_IR_ValueDef_is_a (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ void destroy (
-+ 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 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ValueDef_is_a (const TAO_ServerRequestInfo_IR_ValueDef_is_a &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueDef_is_a &);
--
- private:
-- POA_IR::ValueDef *_tao_impl;
-- const char * id_;
--void result (CORBA::Boolean result);
-- // update the result
--CORBA::Boolean _result;
--};
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-
--class TAO_ServerRequestInfo_IR_ValueDef_create_value_member : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ValueDef;
-- TAO_ServerRequestInfo_IR_ValueDef_create_value_member (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
+ class TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get : public TAO_ServerRequestInfo
+@@ -21093,7 +20923,7 @@
+ 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 ()
-- );
-+ // copy and assignment are not allowed
-+ UsesDef_tie (const UsesDef_tie &);
-+ void operator= (const UsesDef_tie &);
-+ };
-
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ValueDef_create_value_member (const TAO_ServerRequestInfo_IR_ValueDef_create_value_member &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueDef_create_value_member &);
--
--private:
-- POA_IR::ValueDef *_tao_impl;
-- 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 ()
+@@ -21136,11 +20966,11 @@
+ 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_IDLType_ptr type_;
+ const CORBA::Visibility & access_;
+ void result (IR::ValueMemberDef_ptr result);
+ // update the result
-IR::ValueMemberDef_ptr _result;
--};
-+#endif /* ACE_HAS_USING_KEYWORD */
++ IR_ValueMemberDef_ptr _result;
+ };
--class TAO_ServerRequestInfo_IR_ValueDef_create_attribute : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ValueDef;
-- TAO_ServerRequestInfo_IR_ValueDef_create_attribute (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
+ class TAO_ServerRequestInfo_IR_ValueDef_create_attribute : public TAO_ServerRequestInfo
+@@ -21154,10 +20984,10 @@
+ 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 ()
-- );
-+ class EventDef;
-+ typedef EventDef *EventDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_EventDef_ThruPOA_Proxy_Impl;
-+ class _TAO_EventDef_Strategized_Proxy_Broker;
-
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ValueDef_create_attribute (const TAO_ServerRequestInfo_IR_ValueDef_create_attribute &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueDef_create_attribute &);
--
--private:
-- POA_IR::ValueDef *_tao_impl;
-- 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 ()
+ );
+@@ -21199,13 +21029,13 @@
+ 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_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 EventDef : public virtual Contained
-+ {
-+ protected:
-+ EventDef (void);
++ IR_AttributeDef_ptr _result;
+ };
--class TAO_ServerRequestInfo_IR_ValueDef_create_operation : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ValueDef;
-- TAO_ServerRequestInfo_IR_ValueDef_create_operation (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
+ class TAO_ServerRequestInfo_IR_ValueDef_create_operation : public TAO_ServerRequestInfo
+@@ -21219,11 +21049,11 @@
+ 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 ()
-- );
-+ public:
-+ EventDef (const EventDef& rhs);
-+ virtual ~EventDef (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));
--
-- virtual CORBA::Any * result (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ValueDef_create_operation (const TAO_ServerRequestInfo_IR_ValueDef_create_operation &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueDef_create_operation &);
--
--private:
-- POA_IR::ValueDef *_tao_impl;
-- 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 ()
+ );
+@@ -21265,34 +21095,33 @@
+ 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_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;
--};
++ IR_OperationDef_ptr _result;
+ };
--#endif /* TAO_HAS_INTERCEPTORS */
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-+
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
+ #endif /* TAO_HAS_INTERCEPTORS */
--};
-+ static void _is_a_skel (
-+ 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 ()
-+ );
-+
-+ virtual void _dispatch (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-+
-+ IR_EventDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-+
-+ virtual const char* _interface_repository_id (void) const;
-+
-+ virtual CORBA::Boolean is_a (
-+ const char * event_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-+
-+ static void is_a_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-+
-+ virtual IR_ValueDef_ptr event (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-+
-+ static void _get_event_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
+ };
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Declaration
//
--class _TAO_ValueDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ValueDef_Proxy_Broker
-+class _TAO_EventDef_Strategized_Proxy_Broker : public virtual _TAO_EventDef_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_ValueDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ValueDef_Proxy_Broker
++class _TAO_ValueDef_Strategized_Proxy_Broker : public virtual _TAO_ValueDef_Proxy_Broker
{
public:
-- _TAO_ValueDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_ValueDef_Strategized_Proxy_Broker (void);
--
+ _TAO_ValueDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_ValueDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_ValueDef_Proxy_Impl &select_proxy (
- ::IR::ValueDef *object,
-+ _TAO_EventDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_EventDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_EventDef_Proxy_Impl &select_proxy (
-+ IR_EventDef *object,
++ virtual _TAO_ValueDef_Proxy_Impl &select_proxy (
++ IR_ValueDef *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -21310,7 +16643,7 @@
+@@ -21310,7 +21139,7 @@
// 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.
- ::IR::_TAO_ValueDef_Proxy_Impl
-+ _TAO_EventDef_Proxy_Impl
++ _TAO_ValueDef_Proxy_Impl
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -21319,10 +16652,9 @@
- // interface.
-
- public:
-- static _TAO_ValueDef_Strategized_Proxy_Broker *the_TAO_ValueDef_Strategized_Proxy_Broker (void);
-+ static _TAO_EventDef_Strategized_Proxy_Broker *the_TAO_EventDef_Strategized_Proxy_Broker (void);
+@@ -21322,7 +21151,6 @@
+ static _TAO_ValueDef_Strategized_Proxy_Broker *the_TAO_ValueDef_Strategized_Proxy_Broker (void);
};
-
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-@@ -21332,1043 +16664,823 @@
+@@ -21332,8 +21160,8 @@
// ThruPOA Impl. Declaration
//
--class _TAO_ValueDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_ValueDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_ValueDef_Proxy_Impl,
-+class _TAO_EventDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_EventDef_Proxy_Impl,
++class _TAO_ValueDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_ValueDef_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
-+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-
- {
- public:
-- _TAO_ValueDef_ThruPOA_Proxy_Impl (void);
-+ _TAO_EventDef_ThruPOA_Proxy_Impl (void);
+ public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl,
+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl,
+@@ -21345,7 +21173,7 @@
-- virtual ~_TAO_ValueDef_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_EventDef_ThruPOA_Proxy_Impl (void);
+ virtual ~_TAO_ValueDef_ThruPOA_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 (
-+ virtual CORBA::Boolean is_a (
++ virtual IR_InterfaceDefSeq * supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -21355,14 +21183,14 @@
+
+ virtual void supported_interfaces (
CORBA_Object *_collocated_tao_target_,
- const IR::InterfaceDefSeq & supported_interfaces,
-+ const char * event_id,
++ const IR_InterfaceDefSeq & supported_interfaces,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
@@ -34190,13126 +11453,5702 @@
));
- virtual IR::InitializerSeq * initializers (
-+ virtual IR_ValueDef_ptr event (
++ virtual IR_InitializerSeq * initializers (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -21372,14 +21200,14 @@
+
+ virtual void initializers (
CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
+- const IR::InitializerSeq & initializers,
++ const IR_InitializerSeq & initializers,
+ 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
-- )
-- 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
-- ));
++ virtual IR_ValueDef_ptr base_value (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -21389,14 +21217,14 @@
-- virtual void base_value (
-- CORBA_Object *_collocated_tao_target_,
+ virtual void base_value (
+ CORBA_Object *_collocated_tao_target_,
- IR::ValueDef_ptr base_value,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
++ IR_ValueDef_ptr base_value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
- virtual IR::ValueDefSeq * abstract_base_values (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class EventDef_tie : public EventDef
-+ {
-+ public:
-+ EventDef_tie (T &t);
-+ // the T& ctor
-+ EventDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ EventDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ EventDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~EventDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ CORBA::Boolean is_a (
-+ const char * event_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void abstract_base_values (
-- CORBA_Object *_collocated_tao_target_,
++ virtual IR_ValueDefSeq * abstract_base_values (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -21406,7 +21234,7 @@
+
+ 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
-- ));
-+ IR_ValueDef_ptr event (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual CORBA::Boolean is_abstract (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void is_abstract (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Boolean is_abstract,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual CORBA::Boolean is_custom (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void is_custom (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Boolean is_custom,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual CORBA::Boolean is_truncatable (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void is_truncatable (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Boolean is_truncatable,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual CORBA::Boolean is_a (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_ValueDefSeq & abstract_base_values,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -21473,12 +21301,12 @@
+ CORBA::SystemException
+ ));
- virtual IR::ValueMemberDef_ptr create_value_member (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr type,
+ CORBA::Visibility access,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -21486,31 +21314,31 @@
+ CORBA::SystemException
+ ));
- virtual IR::AttributeDef_ptr create_attribute (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ 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 (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--};
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
++ 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 ((
+@@ -21524,11 +21352,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class ValueDef_tie : public ValueDef
--{
--public:
-- ValueDef_tie (T &t);
-- // the T& ctor
-- ValueDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- ValueDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- ValueDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~ValueDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
+-
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export ValueDef_tie : public ValueDef
++ class ValueDef_tie : public ValueDef
+ {
+ public:
+ ValueDef_tie (T &t);
+@@ -21556,10 +21383,10 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
- IR::InterfaceDefSeq * supported_interfaces (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ // copy and assignment are not allowed
-+ EventDef_tie (const EventDef_tie &);
-+ void operator= (const EventDef_tie &);
-+ };
++ IR_InterfaceDefSeq * supported_interfaces (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21568,7 +21395,7 @@
+ ));
-- void supported_interfaces (
+ void supported_interfaces (
- const IR::InterfaceDefSeq & supported_interfaces,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+#endif /* ACE_HAS_USING_KEYWORD */
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21576,7 +21403,7 @@
+ CORBA::SystemException
+ ));
- IR::InitializerSeq * initializers (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ class EmitsDef;
-+ typedef EmitsDef *EmitsDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_EmitsDef_ThruPOA_Proxy_Impl;
-+ class _TAO_EmitsDef_Strategized_Proxy_Broker;
++ IR_InitializerSeq * initializers (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21585,7 +21412,7 @@
+ ));
-- void initializers (
+ void initializers (
- const IR::InitializerSeq & initializers,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ class EmitsDef : public virtual EventDef
-+ {
-+ protected:
-+ EmitsDef (void);
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21593,7 +21420,7 @@
+ CORBA::SystemException
+ ));
- IR::ValueDef_ptr base_value (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ public:
-+ EmitsDef (const EmitsDef& rhs);
-+ virtual ~EmitsDef (void);
++ IR_ValueDef_ptr base_value (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21602,7 +21429,7 @@
+ ));
-- void base_value (
+ void base_value (
- IR::ValueDef_ptr base_value,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
++ IR_ValueDef_ptr base_value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21610,7 +21437,7 @@
+ CORBA::SystemException
+ ));
- IR::ValueDefSeq * abstract_base_values (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ IR_ValueDefSeq * abstract_base_values (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21619,7 +21446,7 @@
+ ));
-- void abstract_base_values (
+ void abstract_base_values (
- const IR::ValueDefSeq & abstract_base_values,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
-
-- CORBA::Boolean is_abstract (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- void is_abstract (
-- CORBA::Boolean is_abstract,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _non_existent_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- CORBA::Boolean is_custom (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual void _dispatch (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- void is_custom (
-- CORBA::Boolean is_custom,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_EmitsDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- CORBA::Boolean is_truncatable (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual const char* _interface_repository_id (void) const;
-
-- void is_truncatable (
-- CORBA::Boolean is_truncatable,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- CORBA::Boolean is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _get_event_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ const IR_ValueDefSeq & abstract_base_values,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21687,11 +21514,11 @@
+ CORBA::SystemException
+ ));
- IR::ValueMemberDef_ptr create_value_member (
-- const char * id,
-- const char * name,
-- const char * version,
++ IR_ValueMemberDef_ptr create_value_member (
+ const char * id,
+ const char * name,
+ const char * version,
- IR::IDLType_ptr type,
-- CORBA::Visibility access,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_IDLType_ptr type,
+ CORBA::Visibility access,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -21700,14 +21527,14 @@
+ CORBA::SystemException
+ ));
- IR::AttributeDef_ptr create_attribute (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ 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 ()
+ )
+@@ -21715,15 +21542,15 @@
+ CORBA::SystemException
+ ));
- IR::OperationDef_ptr create_operation (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_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_default_environment ()
+ )
+@@ -21731,7 +21558,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained_ptr lookup (
-- const char * search_name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_Contained_ptr lookup (
+ const char * search_name,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -21740,8 +21567,8 @@
+ CORBA::SystemException
+ ));
- IR::ContainedSeq * contents (
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_ContainedSeq * contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -21750,10 +21577,10 @@
+ CORBA::SystemException
+ ));
- IR::ContainedSeq * lookup_name (
-- const char * search_name,
-- CORBA::Long levels_to_search,
++ IR_ContainedSeq * lookup_name (
+ const char * search_name,
+ CORBA::Long levels_to_search,
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -21762,8 +21589,8 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_Container::DescriptionSeq * describe_contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Long max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -21773,7 +21600,7 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_ModuleDef_ptr create_module (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -21784,11 +21611,11 @@
+ CORBA::SystemException
+ ));
- IR::ConstantDef_ptr create_constant (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_IDLType_ptr type,
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -21797,11 +21624,11 @@
+ CORBA::SystemException
+ ));
- IR::StructDef_ptr create_struct (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21809,12 +21636,12 @@
+ CORBA::SystemException
+ ));
- IR::UnionDef_ptr create_union (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_IDLType_ptr discriminator_type,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21822,11 +21649,11 @@
+ CORBA::SystemException
+ ));
- IR::EnumDef_ptr create_enum (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21834,11 +21661,11 @@
+ CORBA::SystemException
+ ));
- IR::AliasDef_ptr create_alias (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
++ IR_IDLType_ptr original_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21846,11 +21673,11 @@
+ CORBA::SystemException
+ ));
- IR::InterfaceDef_ptr create_interface (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Declaration
-+//
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -21860,17 +21687,17 @@
+ CORBA::SystemException
+ ));
- 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 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,
++ 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
-- ));
-+class _TAO_EmitsDef_Strategized_Proxy_Broker : public virtual _TAO_EmitsDef_Proxy_Broker
-+{
-+public:
-+ _TAO_EmitsDef_Strategized_Proxy_Broker (void);
++ const IR_ValueDefSeq & abstract_base_values,
++ const IR_InterfaceDefSeq & supported_interfaces,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21878,11 +21705,11 @@
+ CORBA::SystemException
+ ));
- IR::ValueBoxDef_ptr create_value_box (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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 ~_TAO_EmitsDef_Strategized_Proxy_Broker (void);
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21890,11 +21717,11 @@
+ CORBA::SystemException
+ ));
- IR::ExceptionDef_ptr create_exception (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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 _TAO_EmitsDef_Proxy_Impl &select_proxy (
-+ IR_EmitsDef *object,
-+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-+ );
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21902,7 +21729,7 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
-+private:
-
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+// 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
-+ );
-
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+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_EmitsDef_Proxy_Impl
-+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-+
-+ TAO_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.
-
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+public:
-+ static _TAO_EmitsDef_Strategized_Proxy_Broker *the_TAO_EmitsDef_Strategized_Proxy_Broker (void);
-+};
-
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+//
-+// End Strategized Proxy Broker Declaration
-+///////////////////////////////////////////////////////////////////////
-
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Impl. Declaration
-+//
++ IR_NativeDef_ptr create_native (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -21964,7 +21791,7 @@
+ CORBA::SystemException
+ ));
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+class _TAO_EmitsDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_EmitsDef_Proxy_Impl,
-+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl
-+
-+{
-+public:
-+ _TAO_EmitsDef_ThruPOA_Proxy_Impl (void);
-+
-+ virtual ~_TAO_EmitsDef_ThruPOA_Proxy_Impl (void);
-+
-+};
-
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21980,7 +21807,7 @@
+ CORBA::SystemException
+ ));
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21988,7 +21815,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class EmitsDef_tie : public EmitsDef
-+ {
-+ public:
-+ EmitsDef_tie (T &t);
-+ // the T& ctor
-+ EmitsDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ EmitsDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ EmitsDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~EmitsDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ CORBA::Boolean is_a (
-+ const char * event_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void move (
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21997,7 +21824,7 @@
+ ));
+
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_ValueDef_ptr event (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- CORBA::TypeCode_ptr type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -22015,7 +21842,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- ValueDef_tie (const ValueDef_tie &);
-- void operator= (const ValueDef_tie &);
--};
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--#endif /* ACE_HAS_USING_KEYWORD */
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class ValueBoxDef;
--typedef ValueBoxDef *ValueBoxDef_ptr;
--// Forward Classes Declaration
--class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl;
--class _TAO_ValueBoxDef_Strategized_Proxy_Broker;
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class ValueBoxDef : public virtual TypedefDef
--{
--protected:
-- ValueBoxDef (void);
-+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -22049,7 +21876,7 @@
+ class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl;
+ class _TAO_ValueBoxDef_Strategized_Proxy_Broker;
--public:
-- ValueBoxDef (const ValueBoxDef& rhs);
-- virtual ~ValueBoxDef (void);
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+-class TAO_IFR_Client_Export ValueBoxDef : public virtual TypedefDef
++ class ValueBoxDef : public virtual TypedefDef
+ {
+ protected:
+ ValueBoxDef (void);
+@@ -22092,14 +21919,14 @@
+ TAO_default_environment ()
+ );
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _non_existent_skel (
-- 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 ()
-- );
--
- ::IR::ValueBoxDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual const char* _interface_repository_id (void) const;
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
++ IR_ValueBoxDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+
+ virtual const char* _interface_repository_id (void) const;
- virtual IR::IDLType_ptr original_type_def (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ // copy and assignment are not allowed
-+ EmitsDef_tie (const EmitsDef_tie &);
-+ void operator= (const EmitsDef_tie &);
-+ };
-
-- static void _get_original_type_def_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+#endif /* ACE_HAS_USING_KEYWORD */
++ virtual IR_IDLType_ptr original_type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -22116,7 +21943,7 @@
+ );
-- virtual void original_type_def (
+ virtual void original_type_def (
- IR::IDLType_ptr original_type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ class PublishesDef;
-+ typedef PublishesDef *PublishesDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_PublishesDef_ThruPOA_Proxy_Impl;
-+ class _TAO_PublishesDef_Strategized_Proxy_Broker;
-
-- static void _set_original_type_def_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class PublishesDef : public virtual EventDef
-+ {
-+ protected:
-+ PublishesDef (void);
-
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -22136,7 +21963,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ public:
-+ PublishesDef (const PublishesDef& rhs);
-+ virtual ~PublishesDef (void);
-
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -22144,7 +21971,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -22152,7 +21979,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -22160,7 +21987,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -22168,7 +21995,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -22176,7 +22003,7 @@
+ 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 ()
-+ );
-
-- static void _get_defined_in_skel (
-- 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 ()
-+ );
-
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_PublishesDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -22184,7 +22011,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual const char* _interface_repository_id (void) const;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -22192,7 +22019,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -22200,7 +22027,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_event_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_type_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -22208,7 +22035,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -22216,7 +22043,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -22224,7 +22051,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
--
--#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_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::ValueBoxDef;
-- TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueBoxDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -22232,7 +22059,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- virtual Dynamic::ParameterList * arguments (
-- CORBA::Environment &ACE_TRY_ENV =
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
-- CORBA::Environment &ACE_TRY_ENV =
-+ );
-+
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-- CORBA::Environment &ACE_TRY_ENV =
-+ );
-+
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -22240,11 +22067,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get (const TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get &);
--
-- private:
-- POA_IR::ValueBoxDef *_tao_impl;
-- void result (IR::IDLType_ptr result);
-- // update the result
+ TAO_default_environment ()
+ );
+
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -22298,7 +22124,7 @@
+ POA_IR::ValueBoxDef *_tao_impl;
+ void result (IR::IDLType_ptr result);
+ // update the result
-IR::IDLType_ptr _result;
--};
-+ );
++ IR_IDLType_ptr _result;
+ };
--class TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ValueBoxDef;
-- TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ValueBoxDef *tao_impl
-- ,
+ class TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set : public TAO_ServerRequestInfo
+@@ -22309,7 +22135,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::ValueBoxDef *tao_impl
+ ,
- IR::IDLType_ptr original_type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set (const TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set &);
--
--private:
-- POA_IR::ValueBoxDef *_tao_impl;
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -22348,27 +22174,26 @@
+
+ private:
+ POA_IR::ValueBoxDef *_tao_impl;
- IR::IDLType_ptr original_type_def_;
--};
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_IDLType_ptr original_type_def_;
+ };
--#endif /* TAO_HAS_INTERCEPTORS */
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ #endif /* TAO_HAS_INTERCEPTORS */
--};
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
+ };
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Declaration
//
--class _TAO_ValueBoxDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ValueBoxDef_Proxy_Broker
-+class _TAO_PublishesDef_Strategized_Proxy_Broker : public virtual _TAO_PublishesDef_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_ValueBoxDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ValueBoxDef_Proxy_Broker
++class _TAO_ValueBoxDef_Strategized_Proxy_Broker : public virtual _TAO_ValueBoxDef_Proxy_Broker
{
public:
-- _TAO_ValueBoxDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_ValueBoxDef_Strategized_Proxy_Broker (void);
--
+ _TAO_ValueBoxDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_ValueBoxDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_ValueBoxDef_Proxy_Impl &select_proxy (
- ::IR::ValueBoxDef *object,
-+ _TAO_PublishesDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_PublishesDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_PublishesDef_Proxy_Impl &select_proxy (
-+ IR_PublishesDef *object,
++ virtual _TAO_ValueBoxDef_Proxy_Impl &select_proxy (
++ IR_ValueBoxDef *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -22386,7 +17498,7 @@
+@@ -22386,7 +22211,7 @@
// 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.
- ::IR::_TAO_ValueBoxDef_Proxy_Impl
-+ _TAO_PublishesDef_Proxy_Impl
++ _TAO_ValueBoxDef_Proxy_Impl
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -22395,10 +17507,9 @@
- // interface.
-
- public:
-- static _TAO_ValueBoxDef_Strategized_Proxy_Broker *the_TAO_ValueBoxDef_Strategized_Proxy_Broker (void);
-+ static _TAO_PublishesDef_Strategized_Proxy_Broker *the_TAO_PublishesDef_Strategized_Proxy_Broker (void);
+@@ -22398,7 +22223,6 @@
+ static _TAO_ValueBoxDef_Strategized_Proxy_Broker *the_TAO_ValueBoxDef_Strategized_Proxy_Broker (void);
};
-
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-@@ -22408,34 +17519,17 @@
+@@ -22408,8 +22232,8 @@
// ThruPOA Impl. Declaration
//
--class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_ValueBoxDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_ValueBoxDef_Proxy_Impl,
-+class _TAO_PublishesDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_PublishesDef_Proxy_Impl,
++class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_ValueBoxDef_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl
-+ public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl
+ public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl
- {
- public:
-- _TAO_ValueBoxDef_ThruPOA_Proxy_Impl (void);
-+ _TAO_PublishesDef_ThruPOA_Proxy_Impl (void);
+@@ -22419,7 +22243,7 @@
-- virtual ~_TAO_ValueBoxDef_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_PublishesDef_ThruPOA_Proxy_Impl (void);
+ virtual ~_TAO_ValueBoxDef_ThruPOA_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
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
- };
-
++ virtual IR_IDLType_ptr original_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -22429,7 +22253,7 @@
-@@ -22443,439 +17537,369 @@
+ 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 ((
+@@ -22443,11 +22267,10 @@
// ThruPOA Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-
#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class ValueBoxDef_tie : public ValueBoxDef
--{
--public:
-- ValueBoxDef_tie (T &t);
-- // the T& ctor
-- ValueBoxDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- ValueBoxDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- ValueBoxDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~ValueBoxDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export ValueBoxDef_tie : public ValueBoxDef
++ class ValueBoxDef_tie : public ValueBoxDef
+ {
+ public:
+ ValueBoxDef_tie (T &t);
+@@ -22475,10 +22298,10 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
- IR::IDLType_ptr original_type_def (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void original_type_def (
++ IR_IDLType_ptr original_type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -22487,7 +22310,7 @@
+ ));
+
+ void original_type_def (
- IR::IDLType_ptr original_type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class PublishesDef_tie : public PublishesDef
-+ {
-+ public:
-+ PublishesDef_tie (T &t);
-+ // the T& ctor
-+ PublishesDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ PublishesDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ PublishesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~PublishesDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ CORBA::Boolean is_a (
-+ const char * event_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_ValueDef_ptr event (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -22546,7 +22369,7 @@
+ CORBA::SystemException
+ ));
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -22562,7 +22385,7 @@
+ CORBA::SystemException
+ ));
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -22570,7 +22393,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void move (
-- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- CORBA::TypeCode_ptr type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void move (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -22579,7 +22402,7 @@
+ ));
+
+ 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 =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -22597,7 +22420,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -22631,7 +22454,7 @@
+ class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
+ class _TAO_ProvidesDef_Strategized_Proxy_Broker;
- private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- ValueBoxDef_tie (const ValueBoxDef_tie &);
-- void operator= (const ValueBoxDef_tie &);
--};
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-+
-+ // copy and assignment are not allowed
-+ PublishesDef_tie (const PublishesDef_tie &);
-+ void operator= (const PublishesDef_tie &);
-+ };
-
- #endif /* ACE_HAS_USING_KEYWORD */
-
--class ProvidesDef;
--typedef ProvidesDef *ProvidesDef_ptr;
--// Forward Classes Declaration
--class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
--class _TAO_ProvidesDef_Strategized_Proxy_Broker;
-+ class ConsumesDef;
-+ typedef ConsumesDef *ConsumesDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_ConsumesDef_ThruPOA_Proxy_Impl;
-+ class _TAO_ConsumesDef_Strategized_Proxy_Broker;
-
--class ProvidesDef : public virtual Contained
--{
--protected:
-- ProvidesDef (void);
-+ class ConsumesDef : public virtual EventDef
-+ {
-+ protected:
-+ ConsumesDef (void);
+-class TAO_IFR_Client_Export ProvidesDef : public virtual Contained
++ class ProvidesDef : public virtual Contained
+ {
+ protected:
+ ProvidesDef (void);
+@@ -22674,14 +22497,14 @@
+ TAO_default_environment ()
+ );
--public:
-- ProvidesDef (const ProvidesDef& rhs);
-- virtual ~ProvidesDef (void);
-+ public:
-+ ConsumesDef (const ConsumesDef& rhs);
-+ virtual ~ConsumesDef (void);
+- ::IR::ProvidesDef *_this (
++ IR_ProvidesDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+ virtual const char* _interface_repository_id (void) const;
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+ virtual void* _downcast (
-+ 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 ()
-- );
--
-- static void _non_existent_skel (
-- 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 ()
-- );
--
-- ::IR::ProvidesDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual const char* _interface_repository_id (void) const;
--
- virtual IR::InterfaceDef_ptr interface_type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
-- static void _get_interface_type_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ virtual IR_InterfaceDef_ptr interface_type (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -22701,7 +22524,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -22709,7 +22532,7 @@
+ 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 ()
-+ );
-
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -22717,7 +22540,7 @@
+ 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 ()
-+ );
-
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -22725,7 +22548,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_ConsumesDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -22733,7 +22556,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual const char* _interface_repository_id (void) const;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -22741,7 +22564,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -22749,7 +22572,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_event_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -22757,7 +22580,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -22765,7 +22588,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -22773,7 +22596,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -22781,7 +22604,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -22789,7 +22612,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -22797,11 +22620,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-
--#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_ServerRequestInfo_IR_ProvidesDef_interface_type_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::ProvidesDef;
-- TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ProvidesDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- virtual Dynamic::ParameterList * arguments (
-- CORBA::Environment &ACE_TRY_ENV =
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
-- CORBA::Environment &ACE_TRY_ENV =
-+ );
-+
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-- CORBA::Environment &ACE_TRY_ENV =
-+ );
-+
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get (const TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get &);
--
-- private:
-- POA_IR::ProvidesDef *_tao_impl;
-- void result (IR::InterfaceDef_ptr result);
-- // update the result
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -22855,27 +22677,26 @@
+ POA_IR::ProvidesDef *_tao_impl;
+ void result (IR::InterfaceDef_ptr result);
+ // update the result
-IR::InterfaceDef_ptr _result;
--};
-+ );
++ IR_InterfaceDef_ptr _result;
+ };
--#endif /* TAO_HAS_INTERCEPTORS */
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ #endif /* TAO_HAS_INTERCEPTORS */
--};
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
+ };
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Declaration
//
--class _TAO_ProvidesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ProvidesDef_Proxy_Broker
-+class _TAO_ConsumesDef_Strategized_Proxy_Broker : public virtual _TAO_ConsumesDef_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_ProvidesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ProvidesDef_Proxy_Broker
++class _TAO_ProvidesDef_Strategized_Proxy_Broker : public virtual _TAO_ProvidesDef_Proxy_Broker
{
public:
-- _TAO_ProvidesDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_ProvidesDef_Strategized_Proxy_Broker (void);
--
+ _TAO_ProvidesDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_ProvidesDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_ProvidesDef_Proxy_Impl &select_proxy (
- ::IR::ProvidesDef *object,
-+ _TAO_ConsumesDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_ConsumesDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
-+ IR_ConsumesDef *object,
++ virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy (
++ IR_ProvidesDef *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -22893,7 +17917,7 @@
+@@ -22893,7 +22714,7 @@
// 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.
- ::IR::_TAO_ProvidesDef_Proxy_Impl
-+ _TAO_ConsumesDef_Proxy_Impl
++ _TAO_ProvidesDef_Proxy_Impl
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -22902,10 +17926,9 @@
- // interface.
-
- public:
-- static _TAO_ProvidesDef_Strategized_Proxy_Broker *the_TAO_ProvidesDef_Strategized_Proxy_Broker (void);
-+ static _TAO_ConsumesDef_Strategized_Proxy_Broker *the_TAO_ConsumesDef_Strategized_Proxy_Broker (void);
+@@ -22905,7 +22726,6 @@
+ static _TAO_ProvidesDef_Strategized_Proxy_Broker *the_TAO_ProvidesDef_Strategized_Proxy_Broker (void);
};
-
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-@@ -22915,25 +17938,17 @@
+@@ -22915,8 +22735,8 @@
// ThruPOA Impl. Declaration
//
--class _TAO_ProvidesDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_ProvidesDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_ProvidesDef_Proxy_Impl,
-+class _TAO_ConsumesDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_ConsumesDef_Proxy_Impl,
++class _TAO_ProvidesDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_ProvidesDef_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-+ public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl
+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
- {
- public:
-- _TAO_ProvidesDef_ThruPOA_Proxy_Impl (void);
-+ _TAO_ConsumesDef_ThruPOA_Proxy_Impl (void);
+@@ -22926,7 +22746,7 @@
-- virtual ~_TAO_ProvidesDef_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_ConsumesDef_ThruPOA_Proxy_Impl (void);
+ virtual ~_TAO_ProvidesDef_ThruPOA_Proxy_Impl (void) { }
- virtual IR::InterfaceDef_ptr interface_type (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
- };
-
-
-@@ -22941,1935 +17956,1767 @@
++ virtual IR_InterfaceDef_ptr interface_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -22941,11 +22761,10 @@
// ThruPOA Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-
#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class ProvidesDef_tie : public ProvidesDef
--{
--public:
-- ProvidesDef_tie (T &t);
-- // the T& ctor
-- ProvidesDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- ProvidesDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- ProvidesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~ProvidesDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export ProvidesDef_tie : public ProvidesDef
++ class ProvidesDef_tie : public ProvidesDef
+ {
+ public:
+ ProvidesDef_tie (T &t);
+@@ -22973,10 +22792,10 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
- IR::InterfaceDef_ptr interface_type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class ConsumesDef_tie : public ConsumesDef
-+ {
-+ public:
-+ ConsumesDef_tie (T &t);
-+ // the T& ctor
-+ ConsumesDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ ConsumesDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ ConsumesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~ConsumesDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ CORBA::Boolean is_a (
-+ const char * event_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_ValueDef_ptr event (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_InterfaceDef_ptr interface_type (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -23035,7 +22854,7 @@
+ CORBA::SystemException
+ ));
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -23051,7 +22870,7 @@
+ CORBA::SystemException
+ ));
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -23059,7 +22878,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void move (
-- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -23068,7 +22887,7 @@
+ ));
-- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void move (
+ 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 =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -23078,7 +22897,7 @@
+ CORBA::SystemException
+ ));
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+- IR::DefinitionKind def_kind (
+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
- private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- ProvidesDef_tie (const ProvidesDef_tie &);
-- void operator= (const ProvidesDef_tie &);
--};
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -23112,7 +22931,7 @@
+ class _TAO_UsesDef_ThruPOA_Proxy_Impl;
+ class _TAO_UsesDef_Strategized_Proxy_Broker;
--#endif /* ACE_HAS_USING_KEYWORD */
-+ // copy and assignment are not allowed
-+ ConsumesDef_tie (const ConsumesDef_tie &);
-+ void operator= (const ConsumesDef_tie &);
-+ };
-
--class UsesDef;
--typedef UsesDef *UsesDef_ptr;
--// Forward Classes Declaration
--class _TAO_UsesDef_ThruPOA_Proxy_Impl;
--class _TAO_UsesDef_Strategized_Proxy_Broker;
-+#endif /* ACE_HAS_USING_KEYWORD */
-
--class UsesDef : public virtual Contained
--{
--protected:
-- UsesDef (void);
-+ class ComponentDef;
-+ typedef ComponentDef *ComponentDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-+ class _TAO_ComponentDef_Strategized_Proxy_Broker;
+-class TAO_IFR_Client_Export UsesDef : public virtual Contained
++ class UsesDef : public virtual Contained
+ {
+ protected:
+ UsesDef (void);
+@@ -23155,14 +22974,14 @@
+ TAO_default_environment ()
+ );
--public:
-- UsesDef (const UsesDef& rhs);
-- virtual ~UsesDef (void);
-+ class ComponentDef : public virtual InterfaceDef
-+ {
-+ protected:
-+ ComponentDef (void);
+- ::IR::UsesDef *_this (
++ IR_UsesDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
-+ public:
-+ ComponentDef (const ComponentDef& rhs);
-+ virtual ~ComponentDef (void);
+ virtual const char* _interface_repository_id (void) const;
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
+- virtual IR::InterfaceDef_ptr interface_type (
++ virtual IR_InterfaceDef_ptr interface_type (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -23198,7 +23017,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
-
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _is_a_skel (
-+ 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,
+@@ -23206,7 +23025,7 @@
+ 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 ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- ::IR::UsesDef *_this (
-- 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 ()
-+ );
-
-- virtual const char* _interface_repository_id (void) const;
-+ IR_ComponentDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+@@ -23214,7 +23033,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- virtual IR::InterfaceDef_ptr interface_type (
+@@ -23222,7 +23041,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual const char* _interface_repository_id (void) const;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_interface_type_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_InterfaceDefSeq * supported_interfaces (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- virtual CORBA::Boolean is_multiple (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _get_supported_interfaces_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_is_multiple_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -23230,7 +23049,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void supported_interfaces (
-+ const IR_InterfaceDefSeq & supported_interfaces,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_supported_interfaces_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_ComponentDef_ptr base_component (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_base_component_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_ProvidesDefSeq * provides_interfaces (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -23238,7 +23057,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_provides_interfaces_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -23246,7 +23065,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_UsesDefSeq * uses_interfaces (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -23254,7 +23073,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_uses_interfaces_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -23262,7 +23081,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_EmitsDefSeq * emits_events (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -23270,7 +23089,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_emits_events_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -23278,7 +23097,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_PublishesDefSeq * publishes_events (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -23286,7 +23105,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_publishes_events_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -23294,11 +23113,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- 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
-+ )) = 0;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-
--#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_ServerRequestInfo_IR_UsesDef_interface_type_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::UsesDef;
-- TAO_ServerRequestInfo_IR_UsesDef_interface_type_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::UsesDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_consumes_events_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual Dynamic::ParameterList * arguments (
-+ virtual CORBA::Boolean is_basic (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-+
-+ static void _get_is_basic_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-+ );
-+
-+ 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_UsesDef_interface_type_get (const TAO_ServerRequestInfo_IR_UsesDef_interface_type_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_UsesDef_interface_type_get &);
--
-- private:
-- POA_IR::UsesDef *_tao_impl;
-- void result (IR::InterfaceDef_ptr result);
-- // update the result
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -23352,7 +23170,7 @@
+ POA_IR::UsesDef *_tao_impl;
+ void result (IR::InterfaceDef_ptr result);
+ // update the result
-IR::InterfaceDef_ptr _result;
--};
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ IR_InterfaceDef_ptr _result;
+ };
--class TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::UsesDef;
-- TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::UsesDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void create_provides_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get (const TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get &);
--
--private:
-- POA_IR::UsesDef *_tao_impl;
-- void result (CORBA::Boolean result);
-- // update the result
--CORBA::Boolean _result;
--};
-+ 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
-+ )) = 0;
-
--#endif /* TAO_HAS_INTERCEPTORS */
-+ static void create_uses_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+ class TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get : public TAO_ServerRequestInfo
+@@ -23410,20 +23228,19 @@
--};
-+ 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
-+ )) = 0;
-
-+ static void create_emits_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Declaration
--//
-+ 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
-+ )) = 0;
-
--class _TAO_UsesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_UsesDef_Proxy_Broker
--{
--public:
-- _TAO_UsesDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_UsesDef_Strategized_Proxy_Broker (void);
--
+ };
+
+-
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Declaration
+ //
+
+-class TAO_IFR_Client_Export _TAO_UsesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_UsesDef_Proxy_Broker
++class _TAO_UsesDef_Strategized_Proxy_Broker : public virtual _TAO_UsesDef_Proxy_Broker
+ {
+ public:
+ _TAO_UsesDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_UsesDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_UsesDef_Proxy_Impl &select_proxy (
- ::IR::UsesDef *object,
-- CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-- );
-+ static void create_publishes_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--private:
-+ 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
-+ )) = 0;
-
--// 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
-- );
-+ static void create_consumes_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ virtual _TAO_UsesDef_Proxy_Impl &select_proxy (
++ IR_UsesDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
--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.
+@@ -23441,7 +23258,7 @@
+ // 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.
- ::IR::_TAO_UsesDef_Proxy_Impl
-- *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
--
-- TAO_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.
-+ static void _get_base_interfaces_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ _TAO_UsesDef_Proxy_Impl
+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
+
+ TAO_SYNCH_MUTEX mutex_;
+@@ -23453,7 +23270,6 @@
+ static _TAO_UsesDef_Strategized_Proxy_Broker *the_TAO_UsesDef_Strategized_Proxy_Broker (void);
+ };
--public:
-- static _TAO_UsesDef_Strategized_Proxy_Broker *the_TAO_UsesDef_Strategized_Proxy_Broker (void);
--};
-+ static void _set_base_interfaces_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void _get_is_abstract_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--//
--// End Strategized Proxy Broker Declaration
--///////////////////////////////////////////////////////////////////////
-+ static void _set_is_abstract_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void _get_is_local_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Impl. Declaration
--//
-+ static void _set_is_local_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--class _TAO_UsesDef_ThruPOA_Proxy_Impl :
+-
+ //
+ // End Strategized Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -23463,8 +23279,8 @@
+ // ThruPOA Impl. Declaration
+ //
+
+-class TAO_IFR_Client_Export _TAO_UsesDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_UsesDef_Proxy_Impl,
-- public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
--
--{
--public:
-- _TAO_UsesDef_ThruPOA_Proxy_Impl (void);
--
-- virtual ~_TAO_UsesDef_ThruPOA_Proxy_Impl (void) { }
--
++class _TAO_UsesDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_UsesDef_Proxy_Impl,
+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
+
+@@ -23474,7 +23290,7 @@
+
+ virtual ~_TAO_UsesDef_ThruPOA_Proxy_Impl (void) { }
+
- virtual IR::InterfaceDef_ptr interface_type (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ virtual IR_InterfaceDef_ptr interface_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -23497,11 +23313,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
-- virtual CORBA::Boolean is_multiple (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_attribute_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+-
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export UsesDef_tie : public UsesDef
++ class UsesDef_tie : public UsesDef
+ {
+ public:
+ UsesDef_tie (T &t);
+@@ -23529,10 +23344,10 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
+- IR::InterfaceDef_ptr interface_type (
++ IR_InterfaceDef_ptr interface_type (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -23599,7 +23414,7 @@
+ CORBA::SystemException
+ ));
--};
-+ static void create_operation_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+- IR::Container_ptr defined_in (
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -23615,7 +23430,7 @@
+ CORBA::SystemException
+ ));
-+ static void lookup_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+- IR::Repository_ptr containing_repository (
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -23623,7 +23438,7 @@
+ CORBA::SystemException
+ ));
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
-+ static void contents_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+- IR::Contained::Description * describe (
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -23632,7 +23447,7 @@
+ ));
-+ static void lookup_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ 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 =
+@@ -23642,7 +23457,7 @@
+ CORBA::SystemException
+ ));
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class UsesDef_tie : public UsesDef
--{
--public:
-- UsesDef_tie (T &t);
-- // the T& ctor
-- UsesDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- UsesDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- UsesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~UsesDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- IR::InterfaceDef_ptr interface_type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void describe_contents_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+- IR::DefinitionKind def_kind (
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -23676,7 +23491,7 @@
+ class _TAO_EventDef_ThruPOA_Proxy_Impl;
+ class _TAO_EventDef_Strategized_Proxy_Broker;
-- CORBA::Boolean is_multiple (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_module_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+-class TAO_IFR_Client_Export EventDef : public virtual Contained
++ class EventDef : public virtual Contained
+ {
+ protected:
+ EventDef (void);
+@@ -23719,7 +23534,7 @@
+ TAO_default_environment ()
+ );
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_constant_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+- ::IR::EventDef *_this (
++ IR_EventDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -23743,7 +23558,7 @@
+ TAO_default_environment ()
+ );
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_struct_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+- virtual IR::ValueDef_ptr event (
++ virtual IR_ValueDef_ptr event (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -23763,7 +23578,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- char * name (
+@@ -23771,7 +23586,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_union_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_enum_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -23779,7 +23594,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- char * version (
+@@ -23787,7 +23602,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_alias_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_interface_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -23795,7 +23610,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- IR::Container_ptr defined_in (
+@@ -23803,7 +23618,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_value_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_value_box_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -23811,7 +23626,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_exception_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -23819,7 +23634,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_native_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -23827,7 +23642,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- void move (
-- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -23835,7 +23650,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -23843,7 +23658,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -23851,7 +23666,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- UsesDef_tie (const UsesDef_tie &);
-- void operator= (const UsesDef_tie &);
--};
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -23859,11 +23674,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--#endif /* ACE_HAS_USING_KEYWORD */
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--class EventDef;
--typedef EventDef *EventDef_ptr;
--// Forward Classes Declaration
--class _TAO_EventDef_ThruPOA_Proxy_Impl;
--class _TAO_EventDef_Strategized_Proxy_Broker;
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_type_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
-+
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Declaration
-+//
-
--class EventDef : public virtual Contained
-+class _TAO_ComponentDef_Strategized_Proxy_Broker : public virtual _TAO_ComponentDef_Proxy_Broker
- {
--protected:
-- EventDef (void);
-+public:
-+ _TAO_ComponentDef_Strategized_Proxy_Broker (void);
-
--public:
-- EventDef (const EventDef& rhs);
-- virtual ~EventDef (void);
-+ virtual ~_TAO_ComponentDef_Strategized_Proxy_Broker (void);
-
-+ virtual _TAO_ComponentDef_Proxy_Impl &select_proxy (
-+ IR_ComponentDef *object,
-+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-+ );
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+private:
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+// 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
-+ );
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+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_ComponentDef_Proxy_Impl
-+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-+
-+ TAO_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.
-
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+public:
-+ static _TAO_ComponentDef_Strategized_Proxy_Broker *the_TAO_ComponentDef_Strategized_Proxy_Broker (void);
-+};
+ TAO_default_environment ()
+ );
-- virtual void _dispatch (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+//
-+// End Strategized Proxy Broker Declaration
-+///////////////////////////////////////////////////////////////////////
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -23970,27 +23784,26 @@
+ POA_IR::EventDef *_tao_impl;
+ void result (IR::ValueDef_ptr result);
+ // update the result
+-IR::ValueDef_ptr _result;
++ IR_ValueDef_ptr _result;
+ };
-- ::IR::EventDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
+ #endif /* TAO_HAS_INTERCEPTORS */
-- virtual const char* _interface_repository_id (void) const;
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Impl. Declaration
-+//
+ };
-- virtual CORBA::Boolean is_a (
-- const char * event_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+class _TAO_ComponentDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_ComponentDef_Proxy_Impl,
-+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl
-+
-+{
-+public:
-+ _TAO_ComponentDef_ThruPOA_Proxy_Impl (void);
-+
-+ virtual ~_TAO_ComponentDef_ThruPOA_Proxy_Impl (void);
-+
-+ virtual IR_InterfaceDefSeq * supported_interfaces (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
-- )) = 0;
-
-- static void is_a_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ ));
-
-- virtual IR::ValueDef_ptr event (
-- 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;
-+ ));
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Declaration
+ //
-- static void _get_event_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_ComponentDef_ptr base_component (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_ProvidesDefSeq * provides_interfaces (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_UsesDefSeq * uses_interfaces (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_EmitsDefSeq * emits_events (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_PublishesDefSeq * publishes_events (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_ConsumesDefSeq * consumes_events (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
--
--#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_ServerRequestInfo_IR_EventDef_is_a : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::EventDef;
-- TAO_ServerRequestInfo_IR_EventDef_is_a (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::EventDef *tao_impl
-- ,
-- 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));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_EventDef_is_a (const TAO_ServerRequestInfo_IR_EventDef_is_a &);
-- void operator= (const TAO_ServerRequestInfo_IR_EventDef_is_a &);
--
-- private:
-- POA_IR::EventDef *_tao_impl;
-- const char * event_id_;
--void result (CORBA::Boolean result);
-- // update the result
--CORBA::Boolean _result;
--};
--
--class TAO_ServerRequestInfo_IR_EventDef_event_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::EventDef;
-- TAO_ServerRequestInfo_IR_EventDef_event_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::EventDef *tao_impl
-- ,
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_EventDef_event_get (const TAO_ServerRequestInfo_IR_EventDef_event_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_EventDef_event_get &);
--
--private:
-- POA_IR::EventDef *_tao_impl;
-- void result (IR::ValueDef_ptr result);
-- // update the result
--IR::ValueDef_ptr _result;
--};
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--};
--
--
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Declaration
--//
--
--class _TAO_EventDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_EventDef_Proxy_Broker
--{
--public:
-- _TAO_EventDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_EventDef_Strategized_Proxy_Broker (void);
--
+-class TAO_IFR_Client_Export _TAO_EventDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_EventDef_Proxy_Broker
++class _TAO_EventDef_Strategized_Proxy_Broker : public virtual _TAO_EventDef_Proxy_Broker
+ {
+ public:
+ _TAO_EventDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_EventDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_EventDef_Proxy_Impl &select_proxy (
- ::IR::EventDef *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.
++ virtual _TAO_EventDef_Proxy_Impl &select_proxy (
++ IR_EventDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -24008,7 +23821,7 @@
+ // 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.
- ::IR::_TAO_EventDef_Proxy_Impl
-- *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
--
-- TAO_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:
-- static _TAO_EventDef_Strategized_Proxy_Broker *the_TAO_EventDef_Strategized_Proxy_Broker (void);
--};
--
--
--//
--// End Strategized Proxy Broker Declaration
--///////////////////////////////////////////////////////////////////////
--
--
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Impl. Declaration
--//
++ _TAO_EventDef_Proxy_Impl
+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
+
+ TAO_SYNCH_MUTEX mutex_;
+@@ -24020,7 +23833,6 @@
+ static _TAO_EventDef_Strategized_Proxy_Broker *the_TAO_EventDef_Strategized_Proxy_Broker (void);
+ };
+
-
--class _TAO_EventDef_ThruPOA_Proxy_Impl :
+ //
+ // End Strategized Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -24030,8 +23842,8 @@
+ // ThruPOA Impl. Declaration
+ //
+
+-class TAO_IFR_Client_Export _TAO_EventDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_EventDef_Proxy_Impl,
-- public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
--
--{
--public:
-- _TAO_EventDef_ThruPOA_Proxy_Impl (void);
--
-- virtual ~_TAO_EventDef_ThruPOA_Proxy_Impl (void) { }
--
-- virtual CORBA::Boolean is_a (
-+ virtual CORBA::Boolean is_basic (
- CORBA_Object *_collocated_tao_target_,
-- const char * event_id,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
++class _TAO_EventDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_EventDef_Proxy_Impl,
+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
+
+@@ -24050,7 +23862,7 @@
CORBA::SystemException
));
- virtual IR::ValueDef_ptr event (
-+ virtual IR_ProvidesDef_ptr create_provides (
++ virtual IR_ValueDef_ptr event (
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
- ));
+@@ -24065,11 +23877,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
--};
--
--
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
-
--
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class EventDef_tie : public EventDef
--{
--public:
-- EventDef_tie (T &t);
-- // the T& ctor
-- EventDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- EventDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- EventDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~EventDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- CORBA::Boolean is_a (
-- const char * event_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- IR::ValueDef_ptr event (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void id (
-+ virtual IR_UsesDef_ptr create_uses (
-+ CORBA_Object *_collocated_tao_target_,
- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void name (
- const char * name,
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export EventDef_tie : public EventDef
++ class EventDef_tie : public EventDef
+ {
+ public:
+ EventDef_tie (T &t);
+@@ -24097,7 +23908,7 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ const char * version,
-+ IR_InterfaceDef_ptr interface_type,
-+ CORBA::Boolean is_multiple,
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+ CORBA::Boolean is_a (
+@@ -24109,7 +23920,7 @@
CORBA::SystemException
));
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ 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
+- IR::ValueDef_ptr event (
++ IR_ValueDef_ptr event (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -24168,7 +23979,7 @@
CORBA::SystemException
));
-- void version (
-+ virtual IR_PublishesDef_ptr create_publishes (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * id,
-+ const char * name,
- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ IR_ValueDef_ptr value,
-+ CORBA::Environment &ACE_TRY_ENV
+- IR::Container_ptr defined_in (
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -24184,7 +23995,7 @@
CORBA::SystemException
));
-- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ 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
+- IR::Repository_ptr containing_repository (
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -24192,7 +24003,7 @@
CORBA::SystemException
));
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+};
-
-- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -24201,7 +24012,7 @@
+ ));
-- void move (
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class ComponentDef_tie : public ComponentDef
-+ {
-+ public:
-+ ComponentDef_tie (T &t);
-+ // the T& ctor
-+ ComponentDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ ComponentDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ ComponentDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~ComponentDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ IR_InterfaceDefSeq * supported_interfaces (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -24211,7 +24022,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void supported_interfaces (
-+ const IR_InterfaceDefSeq & supported_interfaces,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_ComponentDef_ptr base_component (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- EventDef_tie (const EventDef_tie &);
-- void operator= (const EventDef_tie &);
--};
-+ IR_ProvidesDefSeq * provides_interfaces (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--#endif /* ACE_HAS_USING_KEYWORD */
-+ IR_UsesDefSeq * uses_interfaces (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class EmitsDef;
--typedef EmitsDef *EmitsDef_ptr;
--// Forward Classes Declaration
--class _TAO_EmitsDef_ThruPOA_Proxy_Impl;
--class _TAO_EmitsDef_Strategized_Proxy_Broker;
-+ IR_EmitsDefSeq * emits_events (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class EmitsDef : public virtual EventDef
--{
--protected:
-- EmitsDef (void);
-+ IR_PublishesDefSeq * publishes_events (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -24245,7 +24056,7 @@
+ class _TAO_EmitsDef_ThruPOA_Proxy_Impl;
+ class _TAO_EmitsDef_Strategized_Proxy_Broker;
--public:
-- EmitsDef (const EmitsDef& rhs);
-- virtual ~EmitsDef (void);
-+ IR_ConsumesDefSeq * consumes_events (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-+ CORBA::Boolean is_basic (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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 void* _downcast (
-- const char* logical_type_id
-- );
-+ 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
-+ ));
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
-
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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 void _dispatch (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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_IFR_Client_Export EmitsDef : public virtual EventDef
++ class EmitsDef : public virtual EventDef
+ {
+ protected:
+ EmitsDef (void);
+@@ -24288,7 +24099,7 @@
+ TAO_default_environment ()
+ );
- ::IR::EmitsDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_InterfaceDefSeq * base_interfaces (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual const char* _interface_repository_id (void) const;
-+ void base_interfaces (
-+ const IR_InterfaceDefSeq & base_interfaces,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ IR_EmitsDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -24299,7 +24110,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ CORBA::Boolean is_abstract (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_event_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -24307,7 +24118,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void is_abstract (
-+ CORBA::Boolean is_abstract,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -24315,7 +24126,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ CORBA::Boolean is_local (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -24323,7 +24134,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void is_local (
-+ CORBA::Boolean is_local,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -24331,7 +24142,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ CORBA::Boolean is_a (
-+ const char * interface_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -24339,7 +24150,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -24347,7 +24158,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -24355,7 +24166,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Contained_ptr lookup (
-+ const char * search_name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -24363,7 +24174,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_ContainedSeq * contents (
-+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -24371,7 +24182,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_ContainedSeq * lookup_name (
-+ const char * search_name,
-+ CORBA::Long levels_to_search,
-+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -24379,7 +24190,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
-
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -24387,7 +24198,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
-
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -24395,7 +24206,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
-
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -24403,7 +24214,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
-
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -24411,11 +24222,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ 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
-+ ));
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-
--#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 */
-+ 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
-+ ));
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -24425,20 +24235,19 @@
--};
-+ 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
-+ ));
+ };
-+ 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
-+ ));
-
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Declaration
--//
-+ 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
-+ ));
-
--class _TAO_EmitsDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_EmitsDef_Proxy_Broker
--{
--public:
-- _TAO_EmitsDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_EmitsDef_Strategized_Proxy_Broker (void);
--
+-
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Declaration
+ //
+
+-class TAO_IFR_Client_Export _TAO_EmitsDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_EmitsDef_Proxy_Broker
++class _TAO_EmitsDef_Strategized_Proxy_Broker : public virtual _TAO_EmitsDef_Proxy_Broker
+ {
+ public:
+ _TAO_EmitsDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_EmitsDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_EmitsDef_Proxy_Impl &select_proxy (
- ::IR::EmitsDef *object,
-- CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-- );
-+ 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
-+ ));
-
--private:
-+ 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
-+ ));
-
--// 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
-- );
-+ 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 _TAO_EmitsDef_Proxy_Impl &select_proxy (
++ IR_EmitsDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
--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.
+@@ -24456,7 +24265,7 @@
+ // 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.
- ::IR::_TAO_EmitsDef_Proxy_Impl
-- *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
--
-- TAO_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.
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--public:
-- static _TAO_EmitsDef_Strategized_Proxy_Broker *the_TAO_EmitsDef_Strategized_Proxy_Broker (void);
--};
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--//
--// End Strategized Proxy Broker Declaration
--///////////////////////////////////////////////////////////////////////
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Impl. Declaration
--//
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class _TAO_EmitsDef_ThruPOA_Proxy_Impl :
-- public virtual ::IR::_TAO_EmitsDef_Proxy_Impl,
-- public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl
--
--{
--public:
-- _TAO_EmitsDef_ThruPOA_Proxy_Impl (void);
--
-- virtual ~_TAO_EmitsDef_ThruPOA_Proxy_Impl (void) { }
--
-- };
-+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ _TAO_EmitsDef_Proxy_Impl
+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
+
+ TAO_SYNCH_MUTEX mutex_;
+@@ -24468,7 +24277,6 @@
+ static _TAO_EmitsDef_Strategized_Proxy_Broker *the_TAO_EmitsDef_Strategized_Proxy_Broker (void);
+ };
-+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+-
+ //
+ // End Strategized Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -24478,8 +24286,8 @@
+ // ThruPOA Impl. Declaration
+ //
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class EmitsDef_tie : public EmitsDef
--{
--public:
-- EmitsDef_tie (T &t);
-- // the T& ctor
-- EmitsDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- EmitsDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- EmitsDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~EmitsDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- CORBA::Boolean is_a (
-- const char * event_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+-class TAO_IFR_Client_Export _TAO_EmitsDef_ThruPOA_Proxy_Impl :
+- public virtual ::IR::_TAO_EmitsDef_Proxy_Impl,
++class _TAO_EmitsDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_EmitsDef_Proxy_Impl,
+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
+ public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl
+
+@@ -24496,11 +24304,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
-- IR::ValueDef_ptr event (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-
-- char * version (
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export EmitsDef_tie : public EmitsDef
++ class EmitsDef_tie : public EmitsDef
+ {
+ public:
+ EmitsDef_tie (T &t);
+@@ -24528,7 +24335,7 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ // copy and assignment are not allowed
-+ ComponentDef_tie (const ComponentDef_tie &);
-+ void operator= (const ComponentDef_tie &);
-+ };
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+ CORBA::Boolean is_a (
+@@ -24540,7 +24347,7 @@
+ CORBA::SystemException
+ ));
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+#endif /* ACE_HAS_USING_KEYWORD */
+- IR::ValueDef_ptr event (
++ IR_ValueDef_ptr event (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -24599,7 +24406,7 @@
+ CORBA::SystemException
+ ));
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ class PrimaryKeyDef;
-+ typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
-+ class _TAO_PrimaryKeyDef_Strategized_Proxy_Broker;
-
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ class PrimaryKeyDef : public virtual Contained
-+ {
-+ protected:
-+ PrimaryKeyDef (void);
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -24615,7 +24422,7 @@
+ CORBA::SystemException
+ ));
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ public:
-+ PrimaryKeyDef (const PrimaryKeyDef& rhs);
-+ virtual ~PrimaryKeyDef (void);
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -24623,7 +24430,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -24632,7 +24439,7 @@
+ ));
-- void move (
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -24642,7 +24449,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -24676,7 +24483,7 @@
+ class _TAO_PublishesDef_ThruPOA_Proxy_Impl;
+ class _TAO_PublishesDef_Strategized_Proxy_Broker;
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+-class TAO_IFR_Client_Export PublishesDef : public virtual EventDef
++ class PublishesDef : public virtual EventDef
+ {
+ protected:
+ PublishesDef (void);
+@@ -24719,7 +24526,7 @@
+ TAO_default_environment ()
+ );
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- EmitsDef_tie (const EmitsDef_tie &);
-- void operator= (const EmitsDef_tie &);
--};
-+ static void _non_existent_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+- ::IR::PublishesDef *_this (
++ IR_PublishesDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -24730,7 +24537,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
--#endif /* ACE_HAS_USING_KEYWORD */
-+ virtual void _dispatch (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--class PublishesDef;
--typedef PublishesDef *PublishesDef_ptr;
--// Forward Classes Declaration
--class _TAO_PublishesDef_ThruPOA_Proxy_Impl;
--class _TAO_PublishesDef_Strategized_Proxy_Broker;
-+ IR_PrimaryKeyDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+@@ -24738,7 +24545,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
--class PublishesDef : public virtual EventDef
--{
--protected:
-- PublishesDef (void);
-+ virtual const char* _interface_repository_id (void) const;
+@@ -24746,7 +24553,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
--public:
-- PublishesDef (const PublishesDef& rhs);
-- virtual ~PublishesDef (void);
-+ virtual CORBA::Boolean is_a (
-+ const char * primary_key_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-+ static void is_a_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual IR_ValueDef_ptr primary_key (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+ static void _get_primary_key_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -24754,7 +24561,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- virtual void _dispatch (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -24762,7 +24569,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- ::IR::PublishesDef *_this (
+@@ -24770,7 +24577,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- virtual const char* _interface_repository_id (void) const;
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -24778,7 +24585,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+@@ -24786,7 +24593,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_event_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -24794,7 +24601,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -24802,7 +24609,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -24810,7 +24617,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -24818,7 +24625,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -24826,7 +24633,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -24834,7 +24641,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -24842,11 +24649,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-
--#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 */
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--};
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -24856,20 +24662,19 @@
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
+ };
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Declaration
//
--class _TAO_PublishesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_PublishesDef_Proxy_Broker
-+class _TAO_PrimaryKeyDef_Strategized_Proxy_Broker : public virtual _TAO_PrimaryKeyDef_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_PublishesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_PublishesDef_Proxy_Broker
++class _TAO_PublishesDef_Strategized_Proxy_Broker : public virtual _TAO_PublishesDef_Proxy_Broker
{
public:
-- _TAO_PublishesDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_PublishesDef_Strategized_Proxy_Broker (void);
--
+ _TAO_PublishesDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_PublishesDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_PublishesDef_Proxy_Impl &select_proxy (
- ::IR::PublishesDef *object,
-+ _TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
-+ IR_PrimaryKeyDef *object,
++ virtual _TAO_PublishesDef_Proxy_Impl &select_proxy (
++ IR_PublishesDef *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -24887,7 +19734,7 @@
+@@ -24887,7 +24692,7 @@
// 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.
- ::IR::_TAO_PublishesDef_Proxy_Impl
-+ _TAO_PrimaryKeyDef_Proxy_Impl
++ _TAO_PublishesDef_Proxy_Impl
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -24896,10 +19743,9 @@
- // interface.
-
- public:
-- static _TAO_PublishesDef_Strategized_Proxy_Broker *the_TAO_PublishesDef_Strategized_Proxy_Broker (void);
-+ static _TAO_PrimaryKeyDef_Strategized_Proxy_Broker *the_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void);
+@@ -24899,7 +24704,6 @@
+ static _TAO_PublishesDef_Strategized_Proxy_Broker *the_TAO_PublishesDef_Strategized_Proxy_Broker (void);
};
-
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-@@ -24909,398 +19755,476 @@
+@@ -24909,8 +24713,8 @@
// ThruPOA Impl. Declaration
//
--class _TAO_PublishesDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_PublishesDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_PublishesDef_Proxy_Impl,
-+class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_PrimaryKeyDef_Proxy_Impl,
++class _TAO_PublishesDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_PublishesDef_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl
-+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
+ public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl
+@@ -24927,11 +24731,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export PublishesDef_tie : public PublishesDef
++ class PublishesDef_tie : public PublishesDef
{
public:
-- _TAO_PublishesDef_ThruPOA_Proxy_Impl (void);
-+ _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl (void);
+ PublishesDef_tie (T &t);
+@@ -24959,7 +24762,7 @@
-- virtual ~_TAO_PublishesDef_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl (void);
-
-- };
--
--
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
--
--
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class PublishesDef_tie : public PublishesDef
--{
--public:
-- PublishesDef_tie (T &t);
-- // the T& ctor
-- PublishesDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- PublishesDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- PublishesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~PublishesDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- CORBA::Boolean is_a (
-- const char * event_id,
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual CORBA::Boolean is_a (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * primary_key_id,
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+ CORBA::Boolean is_a (
+@@ -24971,7 +24774,7 @@
CORBA::SystemException
));
- IR::ValueDef_ptr event (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-+ virtual IR_ValueDef_ptr primary_key (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_ValueDef_ptr event (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -25030,7 +24833,7 @@
CORBA::SystemException
));
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+};
-
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
-
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class PrimaryKeyDef_tie : public PrimaryKeyDef
-+ {
-+ public:
-+ PrimaryKeyDef_tie (T &t);
-+ // the T& ctor
-+ PrimaryKeyDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ PrimaryKeyDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ PrimaryKeyDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~PrimaryKeyDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ CORBA::Boolean is_a (
-+ const char * primary_key_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_ValueDef_ptr primary_key (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25046,7 +24849,7 @@
+ CORBA::SystemException
+ ));
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25054,7 +24857,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void move (
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25063,7 +24866,7 @@
+ ));
+
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -25073,7 +24876,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- PublishesDef_tie (const PublishesDef_tie &);
-- void operator= (const PublishesDef_tie &);
--};
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--#endif /* ACE_HAS_USING_KEYWORD */
-+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class ConsumesDef;
--typedef ConsumesDef *ConsumesDef_ptr;
--// Forward Classes Declaration
--class _TAO_ConsumesDef_ThruPOA_Proxy_Impl;
--class _TAO_ConsumesDef_Strategized_Proxy_Broker;
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class ConsumesDef : public virtual EventDef
--{
--protected:
-- ConsumesDef (void);
+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--public:
-- ConsumesDef (const ConsumesDef& rhs);
-- virtual ~ConsumesDef (void);
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ // copy and assignment are not allowed
-+ PrimaryKeyDef_tie (const PrimaryKeyDef_tie &);
-+ void operator= (const PrimaryKeyDef_tie &);
-+ };
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+#endif /* ACE_HAS_USING_KEYWORD */
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class FactoryDef;
-+ typedef FactoryDef *FactoryDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_FactoryDef_ThruPOA_Proxy_Impl;
-+ class _TAO_FactoryDef_Strategized_Proxy_Broker;
-
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class FactoryDef : public virtual OperationDef
-+ {
-+ protected:
-+ FactoryDef (void);
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25107,7 +24910,7 @@
+ class _TAO_ConsumesDef_ThruPOA_Proxy_Impl;
+ class _TAO_ConsumesDef_Strategized_Proxy_Broker;
-- virtual void _dispatch (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ public:
-+ FactoryDef (const FactoryDef& rhs);
-+ virtual ~FactoryDef (void);
+-class TAO_IFR_Client_Export ConsumesDef : public virtual EventDef
++ class ConsumesDef : public virtual EventDef
+ {
+ protected:
+ ConsumesDef (void);
+@@ -25150,7 +24953,7 @@
+ TAO_default_environment ()
+ );
- ::IR::ConsumesDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-
-- virtual const char* _interface_repository_id (void) const;
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ IR_ConsumesDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -25161,7 +24964,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_event_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25169,7 +24972,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -25177,7 +24980,7 @@
+ 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 ()
-+ );
-
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -25185,7 +24988,7 @@
+ 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 ()
-+ );
-
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -25193,7 +24996,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_FactoryDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -25201,7 +25004,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual const char* _interface_repository_id (void) const;
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25209,7 +25012,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_result_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -25217,7 +25020,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_result_def_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25225,7 +25028,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_result_def_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25233,7 +25036,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_params_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25241,7 +25044,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_params_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25249,7 +25052,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_mode_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25257,7 +25060,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_mode_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25265,7 +25068,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_contexts_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25273,11 +25076,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_contexts_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-
--#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 */
-+ static void _get_exceptions_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -25287,20 +25089,19 @@
--};
-+ static void _set_exceptions_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--///////////////////////////////////////////////////////////////////////
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
-+
-+///////////////////////////////////////////////////////////////////////
+ };
+
+-
+ ///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Declaration
//
--class _TAO_ConsumesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ConsumesDef_Proxy_Broker
-+class _TAO_FactoryDef_Strategized_Proxy_Broker : public virtual _TAO_FactoryDef_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_ConsumesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ConsumesDef_Proxy_Broker
++class _TAO_ConsumesDef_Strategized_Proxy_Broker : public virtual _TAO_ConsumesDef_Proxy_Broker
{
public:
-- _TAO_ConsumesDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_ConsumesDef_Strategized_Proxy_Broker (void);
--
+ _TAO_ConsumesDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_ConsumesDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_ConsumesDef_Proxy_Impl &select_proxy (
- ::IR::ConsumesDef *object,
-+ _TAO_FactoryDef_Strategized_Proxy_Broker (void);
-+
-+ virtual ~_TAO_FactoryDef_Strategized_Proxy_Broker (void);
-+
-+ virtual _TAO_FactoryDef_Proxy_Impl &select_proxy (
-+ IR_FactoryDef *object,
++ virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
++ IR_ConsumesDef *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -25318,7 +20242,7 @@
+@@ -25318,7 +25119,7 @@
// 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.
- ::IR::_TAO_ConsumesDef_Proxy_Impl
-+ _TAO_FactoryDef_Proxy_Impl
++ _TAO_ConsumesDef_Proxy_Impl
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -25327,10 +20251,9 @@
- // interface.
-
- public:
-- static _TAO_ConsumesDef_Strategized_Proxy_Broker *the_TAO_ConsumesDef_Strategized_Proxy_Broker (void);
-+ static _TAO_FactoryDef_Strategized_Proxy_Broker *the_TAO_FactoryDef_Strategized_Proxy_Broker (void);
+@@ -25330,7 +25131,6 @@
+ static _TAO_ConsumesDef_Strategized_Proxy_Broker *the_TAO_ConsumesDef_Strategized_Proxy_Broker (void);
};
-
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-@@ -25340,5102 +20263,1372 @@
+@@ -25340,8 +25140,8 @@
// ThruPOA Impl. Declaration
//
--class _TAO_ConsumesDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_ConsumesDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_ConsumesDef_Proxy_Impl,
-+class _TAO_FactoryDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_FactoryDef_Proxy_Impl,
++class _TAO_ConsumesDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_ConsumesDef_Proxy_Impl,
public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl
-+ public virtual ::POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl
-
- {
- public:
-- _TAO_ConsumesDef_ThruPOA_Proxy_Impl (void);
-+ _TAO_FactoryDef_ThruPOA_Proxy_Impl (void);
-
-- virtual ~_TAO_ConsumesDef_ThruPOA_Proxy_Impl (void) { }
-+ virtual ~_TAO_FactoryDef_ThruPOA_Proxy_Impl (void);
+ public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl
-- };
-+};
-
-
- //
+@@ -25358,11 +25158,10 @@
// ThruPOA Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-
#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class ConsumesDef_tie : public ConsumesDef
--{
--public:
-- ConsumesDef_tie (T &t);
-- // the T& ctor
-- ConsumesDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- ConsumesDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- ConsumesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~ConsumesDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- CORBA::Boolean is_a (
-- const char * event_id,
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export ConsumesDef_tie : public ConsumesDef
++ class ConsumesDef_tie : public ConsumesDef
+ {
+ public:
+ ConsumesDef_tie (T &t);
+@@ -25390,7 +25189,7 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+ CORBA::Boolean is_a (
+@@ -25402,7 +25201,7 @@
+ CORBA::SystemException
+ ));
+
- IR::ValueDef_ptr event (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class FactoryDef_tie : public FactoryDef
-+ {
-+ public:
-+ FactoryDef_tie (T &t);
-+ // the T& ctor
-+ FactoryDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ FactoryDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ FactoryDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~FactoryDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ CORBA::TypeCode_ptr result (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_IDLType_ptr result_def (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void result_def (
-+ IR_IDLType_ptr result_def,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_ParDescriptionSeq * params (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void params (
-+ const IR_ParDescriptionSeq & params,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_OperationMode mode (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void mode (
-+ IR_OperationMode mode,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_ValueDef_ptr event (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25461,7 +25260,7 @@
+ CORBA::SystemException
+ ));
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_ContextIdSeq * contexts (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void contexts (
-+ const IR_ContextIdSeq & contexts,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25477,7 +25276,7 @@
+ CORBA::SystemException
+ ));
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ IR_ExceptionDefSeq * exceptions (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25485,7 +25284,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void exceptions (
-+ const IR_ExceptionDefSeq & exceptions,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void move (
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25494,7 +25293,7 @@
+ ));
+
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -25504,7 +25303,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- ConsumesDef_tie (const ConsumesDef_tie &);
-- void operator= (const ConsumesDef_tie &);
--};
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--#endif /* ACE_HAS_USING_KEYWORD */
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class ComponentDef;
--typedef ComponentDef *ComponentDef_ptr;
--// Forward Classes Declaration
--class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
--class _TAO_ComponentDef_Strategized_Proxy_Broker;
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class ComponentDef : public virtual InterfaceDef
--{
--protected:
-- ComponentDef (void);
-+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--public:
-- ComponentDef (const ComponentDef& rhs);
-- virtual ~ComponentDef (void);
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void* _downcast (
-- const char* logical_type_id
-- );
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _non_existent_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual void _dispatch (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+private:
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25538,7 +25337,7 @@
+ class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+ class _TAO_ComponentDef_Strategized_Proxy_Broker;
+
+-class TAO_IFR_Client_Export ComponentDef : public virtual InterfaceDef
++ class ComponentDef : public virtual InterfaceDef
+ {
+ protected:
+ ComponentDef (void);
+@@ -25581,14 +25380,14 @@
+ TAO_default_environment ()
+ );
- ::IR::ComponentDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ // copy and assignment are not allowed
-+ FactoryDef_tie (const FactoryDef_tie &);
-+ void operator= (const FactoryDef_tie &);
-+ };
++ IR_ComponentDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
-- virtual const char* _interface_repository_id (void) const;
-+#endif /* ACE_HAS_USING_KEYWORD */
+ virtual const char* _interface_repository_id (void) const;
- virtual IR::InterfaceDefSeq * supported_interfaces (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ class FinderDef;
-+ typedef FinderDef *FinderDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_FinderDef_ThruPOA_Proxy_Impl;
-+ class _TAO_FinderDef_Strategized_Proxy_Broker;
-
-- static void _get_supported_interfaces_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class FinderDef : public virtual OperationDef
-+ {
-+ protected:
-+ FinderDef (void);
++ virtual IR_InterfaceDefSeq * supported_interfaces (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25605,7 +25404,7 @@
+ );
-- virtual void supported_interfaces (
+ virtual void supported_interfaces (
- const IR::InterfaceDefSeq & supported_interfaces,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ public:
-+ FinderDef (const FinderDef& rhs);
-+ virtual ~FinderDef (void);
-
-- static void _set_supported_interfaces_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25621,7 +25420,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::ComponentDef_ptr base_component (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_base_component_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
++ virtual IR_ComponentDef_ptr base_component (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25637,7 +25436,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::ProvidesDefSeq * provides_interfaces (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_provides_interfaces_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_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 ()
-+ );
++ virtual IR_ProvidesDefSeq * provides_interfaces (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25653,7 +25452,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::UsesDefSeq * uses_interfaces (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual void _dispatch (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_uses_interfaces_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_FinderDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ virtual IR_UsesDefSeq * uses_interfaces (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25669,7 +25468,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::EmitsDefSeq * emits_events (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual const char* _interface_repository_id (void) const;
-
-- static void _get_emits_events_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_result_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ virtual IR_EmitsDefSeq * emits_events (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25685,7 +25484,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::PublishesDefSeq * publishes_events (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _get_result_def_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_publishes_events_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_result_def_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ virtual IR_PublishesDefSeq * publishes_events (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25701,7 +25500,7 @@
+ TAO_default_environment ()
+ );
- virtual IR::ConsumesDefSeq * consumes_events (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _get_params_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_consumes_events_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_params_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- virtual CORBA::Boolean is_basic (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ static void _get_mode_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _get_is_basic_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_mode_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ virtual IR_ConsumesDefSeq * consumes_events (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25733,11 +25532,11 @@
+ TAO_default_environment ()
+ );
- virtual IR::ProvidesDef_ptr create_provides (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- )) = 0;
-+ static void _get_contexts_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void create_provides_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_contexts_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_InterfaceDef_ptr interface_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25753,11 +25552,11 @@
+ TAO_default_environment ()
+ );
- virtual IR::UsesDef_ptr create_uses (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- )) = 0;
--
-- static void create_uses_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_exceptions_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_InterfaceDef_ptr interface_type,
+ CORBA::Boolean is_multiple,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -25774,11 +25573,11 @@
+ TAO_default_environment ()
+ );
- virtual IR::EmitsDef_ptr create_emits (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- )) = 0;
-+ static void _set_exceptions_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void create_emits_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25794,11 +25593,11 @@
+ TAO_default_environment ()
+ );
- virtual IR::PublishesDef_ptr create_publishes (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- )) = 0;
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void create_publishes_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25814,11 +25613,11 @@
+ TAO_default_environment ()
+ );
- virtual IR::ConsumesDef_ptr create_consumes (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- )) = 0;
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void create_consumes_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25838,7 +25637,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_base_interfaces_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_base_interfaces_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25846,7 +25645,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_is_abstract_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25854,7 +25653,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_is_abstract_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -25862,7 +25661,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void _get_is_local_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25870,7 +25669,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-- static void _set_is_local_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -25878,7 +25677,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25886,7 +25685,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
-- static void create_attribute_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25894,7 +25693,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
+ TAO_default_environment ()
+ );
-- static void create_operation_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25902,7 +25701,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+///////////////////////////////////////////////////////////////////////
-+// Strategized Proxy Broker Declaration
-+//
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void lookup_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25910,7 +25709,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+class _TAO_FinderDef_Strategized_Proxy_Broker : public virtual _TAO_FinderDef_Proxy_Broker
-+{
-+public:
-+ _TAO_FinderDef_Strategized_Proxy_Broker (void);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void contents_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25918,7 +25717,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual ~_TAO_FinderDef_Strategized_Proxy_Broker (void);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void lookup_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25926,7 +25725,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
-+ IR_FinderDef *object,
-+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-+ );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void describe_contents_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25934,7 +25733,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+private:
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void create_module_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25942,7 +25741,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+// 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
-+ );
-
-- static void create_constant_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -25950,7 +25749,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+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_FinderDef_Proxy_Impl
-+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-+
-+ TAO_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.
-
-- static void create_struct_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -25958,7 +25757,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+public:
-+ static _TAO_FinderDef_Strategized_Proxy_Broker *the_TAO_FinderDef_Strategized_Proxy_Broker (void);
-+};
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void create_union_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25966,7 +25765,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+//
-+// End Strategized Proxy Broker Declaration
-+///////////////////////////////////////////////////////////////////////
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void create_enum_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25974,7 +25773,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void create_alias_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25982,7 +25781,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Impl. Declaration
-+//
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void create_interface_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -25990,7 +25789,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+class _TAO_FinderDef_ThruPOA_Proxy_Impl :
-+ public virtual _TAO_FinderDef_Proxy_Impl,
-+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl
-+
-+{
-+public:
-+ _TAO_FinderDef_ThruPOA_Proxy_Impl (void);
-+
-+ virtual ~_TAO_FinderDef_ThruPOA_Proxy_Impl (void);
-+
-+};
-
-- static void create_value_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -25998,7 +25797,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void create_value_box_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -26006,7 +25805,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-- static void create_exception_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
+@@ -26014,7 +25813,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
-+ class FinderDef_tie : public FinderDef
-+ {
-+ public:
-+ FinderDef_tie (T &t);
-+ // the T& ctor
-+ FinderDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ FinderDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ FinderDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~FinderDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ CORBA::TypeCode_ptr result (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void create_native_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -26022,7 +25821,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_IDLType_ptr result_def (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -26030,7 +25829,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void result_def (
-+ IR_IDLType_ptr result_def,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -26038,7 +25837,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_ParDescriptionSeq * params (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -26046,7 +25845,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void params (
-+ const IR_ParDescriptionSeq & params,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -26054,7 +25853,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_OperationMode mode (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -26062,7 +25861,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void mode (
-+ IR_OperationMode mode,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -26070,7 +25869,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_ContextIdSeq * contexts (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -26078,7 +25877,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void contexts (
-+ const IR_ContextIdSeq & contexts,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -26086,7 +25885,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_ExceptionDefSeq * exceptions (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -26094,7 +25893,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void exceptions (
-+ const IR_ExceptionDefSeq & exceptions,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -26102,7 +25901,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -26110,7 +25909,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_type_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -26118,7 +25917,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -26126,7 +25925,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -26134,11 +25933,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
-
--#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_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::ComponentDef;
-- TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- virtual Dynamic::ParameterList * arguments (
-+ IR_Container_ptr defined_in (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ char * absolute_name (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ IR_Repository_ptr containing_repository (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get (const TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get &);
--
-- private:
-- POA_IR::ComponentDef *_tao_impl;
-- void result (IR::InterfaceDefSeq * result);
-- // update the result
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -26192,7 +25990,7 @@
+ POA_IR::ComponentDef *_tao_impl;
+ void result (IR::InterfaceDefSeq * result);
+ // update the result
-IR::InterfaceDefSeq * _result;
--};
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ IR_InterfaceDefSeq * _result;
+ };
--class TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ComponentDef;
-- TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
+ class TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set : public TAO_ServerRequestInfo
+@@ -26203,7 +26001,7 @@
+ TAO_ServerRequest &_tao_server_request,
+ POA_IR::ComponentDef *tao_impl
+ ,
- const IR::InterfaceDefSeq & supported_interfaces,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ IR_Contained::Description * describe (
-+ 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 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set (const TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set &);
-- void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set &);
--
--private:
-- POA_IR::ComponentDef *_tao_impl;
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -26242,7 +26040,7 @@
+
+ private:
+ POA_IR::ComponentDef *_tao_impl;
- const IR::InterfaceDefSeq & supported_interfaces_;
--};
--
--class TAO_ServerRequestInfo_IR_ComponentDef_base_component_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ComponentDef;
-- TAO_ServerRequestInfo_IR_ComponentDef_base_component_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void move (
-+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
++ const IR_InterfaceDefSeq & supported_interfaces_;
+ };
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ComponentDef_base_component_get (const TAO_ServerRequestInfo_IR_ComponentDef_base_component_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_base_component_get &);
--
--private:
-- POA_IR::ComponentDef *_tao_impl;
-- void result (IR::ComponentDef_ptr result);
-- // update the result
+ class TAO_ServerRequestInfo_IR_ComponentDef_base_component_get : public TAO_ServerRequestInfo
+@@ -26293,7 +26091,7 @@
+ POA_IR::ComponentDef *_tao_impl;
+ void result (IR::ComponentDef_ptr result);
+ // update the result
-IR::ComponentDef_ptr _result;
--};
-+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
--class TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ComponentDef;
-- TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ void destroy (
-+ 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 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
- private:
-- TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get (const TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get &);
--
--private:
-- POA_IR::ComponentDef *_tao_impl;
-- void result (IR::ProvidesDefSeq * result);
-- // update the result
++ IR_ComponentDef_ptr _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get : public TAO_ServerRequestInfo
+@@ -26344,7 +26142,7 @@
+ POA_IR::ComponentDef *_tao_impl;
+ void result (IR::ProvidesDefSeq * result);
+ // update the result
-IR::ProvidesDefSeq * _result;
--};
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
++ IR_ProvidesDefSeq * _result;
+ };
--class TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ComponentDef;
-- TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ // copy and assignment are not allowed
-+ FinderDef_tie (const FinderDef_tie &);
-+ void operator= (const FinderDef_tie &);
-+ };
-
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get (const TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get &);
--
--private:
-- POA_IR::ComponentDef *_tao_impl;
-- void result (IR::UsesDefSeq * result);
-- // update the result
+ class TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get : public TAO_ServerRequestInfo
+@@ -26395,7 +26193,7 @@
+ POA_IR::ComponentDef *_tao_impl;
+ void result (IR::UsesDefSeq * result);
+ // update the result
-IR::UsesDefSeq * _result;
--};
-+#endif /* ACE_HAS_USING_KEYWORD */
++ IR_UsesDefSeq * _result;
+ };
--class TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ComponentDef;
-- TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ class HomeDef;
-+ typedef HomeDef *HomeDef_ptr;
-+ // Forward Classes Declaration
-+ class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-+ class _TAO_HomeDef_Strategized_Proxy_Broker;
-
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get (const TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get &);
--
--private:
-- POA_IR::ComponentDef *_tao_impl;
-- void result (IR::EmitsDefSeq * result);
-- // update the result
+ class TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get : public TAO_ServerRequestInfo
+@@ -26446,7 +26244,7 @@
+ POA_IR::ComponentDef *_tao_impl;
+ void result (IR::EmitsDefSeq * result);
+ // update the result
-IR::EmitsDefSeq * _result;
--};
-+ class HomeDef : public virtual InterfaceDef
-+ {
-+ protected:
-+ HomeDef (void);
++ IR_EmitsDefSeq * _result;
+ };
--class TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ComponentDef;
-- TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ public:
-+ HomeDef (const HomeDef& rhs);
-+ virtual ~HomeDef (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));
--
-- virtual CORBA::Any * result (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get (const TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get &);
--
--private:
-- POA_IR::ComponentDef *_tao_impl;
-- void result (IR::PublishesDefSeq * result);
-- // update the result
+ class TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get : public TAO_ServerRequestInfo
+@@ -26497,7 +26295,7 @@
+ POA_IR::ComponentDef *_tao_impl;
+ void result (IR::PublishesDefSeq * result);
+ // update the result
-IR::PublishesDefSeq * _result;
--};
++ IR_PublishesDefSeq * _result;
+ };
--class TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ComponentDef;
-- TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean _is_a (
-+ const char* logical_type_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));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get (const TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get &);
--
--private:
-- POA_IR::ComponentDef *_tao_impl;
-- void result (IR::ConsumesDefSeq * result);
-- // update the result
+ class TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get : public TAO_ServerRequestInfo
+@@ -26548,7 +26346,7 @@
+ POA_IR::ComponentDef *_tao_impl;
+ void result (IR::ConsumesDefSeq * result);
+ // update the result
-IR::ConsumesDefSeq * _result;
--};
-+ virtual void* _downcast (
-+ const char* logical_type_id
-+ );
++ IR_ConsumesDefSeq * _result;
+ };
--class TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ComponentDef;
-- TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get (const TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get &);
--
--private:
-- POA_IR::ComponentDef *_tao_impl;
-- void result (CORBA::Boolean result);
-- // update the result
--CORBA::Boolean _result;
--};
-+ static void _non_existent_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--class TAO_ServerRequestInfo_IR_ComponentDef_create_provides : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ComponentDef;
-- TAO_ServerRequestInfo_IR_ComponentDef_create_provides (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
+ class TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get : public TAO_ServerRequestInfo
+@@ -26613,7 +26411,7 @@
+ const char * id,
+ const char * name,
+ const char * version,
- IR::InterfaceDef_ptr interface_type,
-- 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 ()
-+ );
-
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ComponentDef_create_provides (const TAO_ServerRequestInfo_IR_ComponentDef_create_provides &);
-- void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_create_provides &);
--
--private:
-- POA_IR::ComponentDef *_tao_impl;
-- const char * id_;
--const char * name_;
--const char * version_;
++ IR_InterfaceDef_ptr interface_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -26655,10 +26453,10 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
-IR::InterfaceDef_ptr interface_type_;
--void result (IR::ProvidesDef_ptr result);
-- // update the result
++ IR_InterfaceDef_ptr interface_type_;
+ void result (IR::ProvidesDef_ptr result);
+ // update the result
-IR::ProvidesDef_ptr _result;
--};
-+ IR_HomeDef *_this (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ IR_ProvidesDef_ptr _result;
+ };
--class TAO_ServerRequestInfo_IR_ComponentDef_create_uses : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ComponentDef;
-- TAO_ServerRequestInfo_IR_ComponentDef_create_uses (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
+ class TAO_ServerRequestInfo_IR_ComponentDef_create_uses : public TAO_ServerRequestInfo
+@@ -26672,7 +26470,7 @@
+ 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 const char* _interface_repository_id (void) const;
-
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ComponentDef_create_uses (const TAO_ServerRequestInfo_IR_ComponentDef_create_uses &);
-- void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_create_uses &);
--
--private:
-- POA_IR::ComponentDef *_tao_impl;
-- 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 ()
+@@ -26715,11 +26513,11 @@
+ 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_InterfaceDef_ptr interface_type_;
+ const CORBA::Boolean & is_multiple_;
+ void result (IR::UsesDef_ptr result);
+ // update the result
-IR::UsesDef_ptr _result;
--};
-+ virtual IR_HomeDef_ptr base_home (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--class TAO_ServerRequestInfo_IR_ComponentDef_create_emits : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ComponentDef;
-- TAO_ServerRequestInfo_IR_ComponentDef_create_emits (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
++ IR_UsesDef_ptr _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_ComponentDef_create_emits : public TAO_ServerRequestInfo
+@@ -26733,7 +26531,7 @@
+ const char * id,
+ const char * name,
+ const char * version,
- IR::ValueDef_ptr value,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_base_home_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ComponentDef_create_emits (const TAO_ServerRequestInfo_IR_ComponentDef_create_emits &);
-- void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_create_emits &);
--
--private:
-- POA_IR::ComponentDef *_tao_impl;
-- const char * id_;
--const char * name_;
--const char * version_;
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -26775,10 +26573,10 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
-IR::ValueDef_ptr value_;
--void result (IR::EmitsDef_ptr result);
-- // update the result
++ IR_ValueDef_ptr value_;
+ void result (IR::EmitsDef_ptr result);
+ // update the result
-IR::EmitsDef_ptr _result;
--};
-+ virtual IR_ComponentDef_ptr managed_component (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--class TAO_ServerRequestInfo_IR_ComponentDef_create_publishes : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ComponentDef;
-- TAO_ServerRequestInfo_IR_ComponentDef_create_publishes (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
++ IR_EmitsDef_ptr _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_ComponentDef_create_publishes : public TAO_ServerRequestInfo
+@@ -26792,7 +26590,7 @@
+ const char * id,
+ const char * name,
+ const char * version,
- IR::ValueDef_ptr value,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_managed_component_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ComponentDef_create_publishes (const TAO_ServerRequestInfo_IR_ComponentDef_create_publishes &);
-- void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_create_publishes &);
--
--private:
-- POA_IR::ComponentDef *_tao_impl;
-- const char * id_;
--const char * name_;
--const char * version_;
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -26834,10 +26632,10 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
-IR::ValueDef_ptr value_;
--void result (IR::PublishesDef_ptr result);
-- // update the result
++ IR_ValueDef_ptr value_;
+ void result (IR::PublishesDef_ptr result);
+ // update the result
-IR::PublishesDef_ptr _result;
--};
-+ virtual IR_PrimaryKeyDef_ptr primary_key (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--class TAO_ServerRequestInfo_IR_ComponentDef_create_consumes : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::ComponentDef;
-- TAO_ServerRequestInfo_IR_ComponentDef_create_consumes (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::ComponentDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
++ IR_PublishesDef_ptr _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_ComponentDef_create_consumes : public TAO_ServerRequestInfo
+@@ -26851,7 +26649,7 @@
+ const char * id,
+ const char * name,
+ const char * version,
- IR::ValueDef_ptr value,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _get_primary_key_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_ComponentDef_create_consumes (const TAO_ServerRequestInfo_IR_ComponentDef_create_consumes &);
-- void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_create_consumes &);
--
--private:
-- POA_IR::ComponentDef *_tao_impl;
-- const char * id_;
--const char * name_;
--const char * version_;
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -26893,30 +26691,29 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
-IR::ValueDef_ptr value_;
--void result (IR::ConsumesDef_ptr result);
-- // update the result
++ IR_ValueDef_ptr value_;
+ void result (IR::ConsumesDef_ptr result);
+ // update the result
-IR::ConsumesDef_ptr _result;
--};
-+ virtual IR_FactoryDefSeq * factories (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--#endif /* TAO_HAS_INTERCEPTORS */
-+ static void _get_factories_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ IR_ConsumesDef_ptr _result;
+ };
--};
-+ virtual IR_FinderDefSeq * finders (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
-+ static void _get_finders_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Declaration
--//
-+ virtual CORBA::Boolean is_basic (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--class _TAO_ComponentDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ComponentDef_Proxy_Broker
--{
--public:
-- _TAO_ComponentDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_ComponentDef_Strategized_Proxy_Broker (void);
--
+ #endif /* TAO_HAS_INTERCEPTORS */
+
+ };
+
+-
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Declaration
+ //
+
+-class TAO_IFR_Client_Export _TAO_ComponentDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ComponentDef_Proxy_Broker
++class _TAO_ComponentDef_Strategized_Proxy_Broker : public virtual _TAO_ComponentDef_Proxy_Broker
+ {
+ public:
+ _TAO_ComponentDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_ComponentDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_ComponentDef_Proxy_Impl &select_proxy (
- ::IR::ComponentDef *object,
-- CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-- );
-+ static void _get_is_basic_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
--private:
-+ virtual IR_PrimaryKeyDef_ptr create_primary_key (
-+ const char * id,
-+ const char * name,
-+ const char * version,
-+ IR_ValueDef_ptr primary_key,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--// 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
-- );
-+ static void create_primary_key_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
++ virtual _TAO_ComponentDef_Proxy_Impl &select_proxy (
++ IR_ComponentDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
--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.
+@@ -26934,7 +26731,7 @@
+ // 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.
- ::IR::_TAO_ComponentDef_Proxy_Impl
-- *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
--
-- TAO_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.
-+ virtual IR_FactoryDef_ptr create_factory (
-+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
++ _TAO_ComponentDef_Proxy_Impl
+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
+
+ TAO_SYNCH_MUTEX mutex_;
+@@ -26946,7 +26743,6 @@
+ static _TAO_ComponentDef_Strategized_Proxy_Broker *the_TAO_ComponentDef_Strategized_Proxy_Broker (void);
+ };
--public:
-- static _TAO_ComponentDef_Strategized_Proxy_Broker *the_TAO_ComponentDef_Strategized_Proxy_Broker (void);
--};
-+ static void create_factory_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
+-
+ //
+ // End Strategized Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -26956,8 +26752,8 @@
+ // ThruPOA Impl. Declaration
+ //
-+ virtual IR_FinderDef_ptr create_finder (
-+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--//
--// End Strategized Proxy Broker Declaration
--///////////////////////////////////////////////////////////////////////
-+ static void create_finder_skel (
-+ TAO_ServerRequest &_tao_req,
-+ void *_tao_obj,
-+ void *_tao_context,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ );
-
-+ static void _get_base_interfaces_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Impl. Declaration
--//
-+ static void _set_base_interfaces_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--class _TAO_ComponentDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_ComponentDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_ComponentDef_Proxy_Impl,
-- public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl
--
--{
--public:
-- _TAO_ComponentDef_ThruPOA_Proxy_Impl (void);
--
-- virtual ~_TAO_ComponentDef_ThruPOA_Proxy_Impl (void) { }
--
++class _TAO_ComponentDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_ComponentDef_Proxy_Impl,
+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
+ public virtual ::POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl
+
+@@ -26967,7 +26763,7 @@
+
+ virtual ~_TAO_ComponentDef_ThruPOA_Proxy_Impl (void) { }
+
- virtual IR::InterfaceDefSeq * supported_interfaces (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _get_is_abstract_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ virtual IR_InterfaceDefSeq * supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -26977,14 +26773,14 @@
-- virtual void supported_interfaces (
-- CORBA_Object *_collocated_tao_target_,
+ virtual void supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
- const IR::InterfaceDefSeq & supported_interfaces,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
- virtual IR::ComponentDef_ptr base_component (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _set_is_abstract_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ virtual IR_ComponentDef_ptr base_component (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -26992,7 +26788,7 @@
+ CORBA::SystemException
+ ));
- virtual IR::ProvidesDefSeq * provides_interfaces (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _get_is_local_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ virtual IR_ProvidesDefSeq * provides_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -27000,7 +26796,7 @@
+ CORBA::SystemException
+ ));
- virtual IR::UsesDefSeq * uses_interfaces (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _set_is_local_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ virtual IR_UsesDefSeq * uses_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -27008,7 +26804,7 @@
+ CORBA::SystemException
+ ));
- virtual IR::EmitsDefSeq * emits_events (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void is_a_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ virtual IR_EmitsDefSeq * emits_events (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -27016,7 +26812,7 @@
+ CORBA::SystemException
+ ));
- virtual IR::PublishesDefSeq * publishes_events (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_attribute_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ virtual IR_PublishesDefSeq * publishes_events (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -27024,7 +26820,7 @@
+ CORBA::SystemException
+ ));
- virtual IR::ConsumesDefSeq * consumes_events (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_operation_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ 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
-- ));
-+ static void lookup_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ virtual IR_ConsumesDefSeq * consumes_events (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -27040,24 +26836,24 @@
+ CORBA::SystemException
+ ));
- virtual IR::ProvidesDef_ptr create_provides (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ static void contents_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_InterfaceDef_ptr interface_type,
+ 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,
++ 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
-- ));
-+ static void lookup_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_InterfaceDef_ptr interface_type,
+ CORBA::Boolean is_multiple,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -27065,36 +26861,36 @@
+ CORBA::SystemException
+ ));
- virtual IR::EmitsDef_ptr create_emits (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
-+ static void describe_contents_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_ValueDef_ptr value,
+ 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,
++ 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
-- ));
-+ static void create_module_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_ValueDef_ptr value,
+ 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,
++ 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
-- ));
-+ static void create_constant_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--};
-+ static void create_struct_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void create_union_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
-+ static void create_enum_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void create_alias_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -27108,11 +26904,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class ComponentDef_tie : public ComponentDef
--{
--public:
-- ComponentDef_tie (T &t);
-- // the T& ctor
-- ComponentDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- ComponentDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- ComponentDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~ComponentDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- IR::InterfaceDefSeq * supported_interfaces (
+-
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export ComponentDef_tie : public ComponentDef
++ class ComponentDef_tie : public ComponentDef
+ {
+ public:
+ ComponentDef_tie (T &t);
+@@ -27140,10 +26935,10 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_interface_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ TAO_default_environment ()
+ );
+- IR::InterfaceDefSeq * supported_interfaces (
++ IR_InterfaceDefSeq * supported_interfaces (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27152,7 +26947,7 @@
+ ));
-- void supported_interfaces (
+ void supported_interfaces (
- const IR::InterfaceDefSeq & supported_interfaces,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_value_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27160,7 +26955,7 @@
+ CORBA::SystemException
+ ));
- IR::ComponentDef_ptr base_component (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_value_box_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_ComponentDef_ptr base_component (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27168,7 +26963,7 @@
+ CORBA::SystemException
+ ));
- IR::ProvidesDefSeq * provides_interfaces (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_exception_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_ProvidesDefSeq * provides_interfaces (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27176,7 +26971,7 @@
+ CORBA::SystemException
+ ));
- IR::UsesDefSeq * uses_interfaces (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void create_native_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_UsesDefSeq * uses_interfaces (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27184,7 +26979,7 @@
+ CORBA::SystemException
+ ));
- IR::EmitsDefSeq * emits_events (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _get_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_EmitsDefSeq * emits_events (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27192,7 +26987,7 @@
+ CORBA::SystemException
+ ));
- IR::PublishesDefSeq * publishes_events (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ static void _set_id_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_PublishesDefSeq * publishes_events (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27200,7 +26995,7 @@
+ CORBA::SystemException
+ ));
- IR::ConsumesDefSeq * consumes_events (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- CORBA::Boolean is_basic (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_ConsumesDefSeq * consumes_events (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27216,11 +27011,11 @@
+ CORBA::SystemException
+ ));
+
- IR::ProvidesDef_ptr create_provides (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
--
++ IR_InterfaceDef_ptr interface_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27228,11 +27023,11 @@
+ CORBA::SystemException
+ ));
+
- IR::UsesDef_ptr create_uses (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
--
++ IR_InterfaceDef_ptr interface_type,
+ CORBA::Boolean is_multiple,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -27241,11 +27036,11 @@
+ CORBA::SystemException
+ ));
+
- IR::EmitsDef_ptr create_emits (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
--
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27253,11 +27048,11 @@
+ CORBA::SystemException
+ ));
+
- IR::PublishesDef_ptr create_publishes (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
--
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27265,11 +27060,11 @@
+ CORBA::SystemException
+ ));
+
- IR::ConsumesDef_ptr create_consumes (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
--
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27277,7 +27072,7 @@
+ CORBA::SystemException
+ ));
+
- IR::InterfaceDefSeq * base_interfaces (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void base_interfaces (
++ IR_InterfaceDefSeq * base_interfaces (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27286,7 +27081,7 @@
+ ));
+
+ void base_interfaces (
- const IR::InterfaceDefSeq & base_interfaces,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- CORBA::Boolean is_abstract (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void is_abstract (
-- CORBA::Boolean is_abstract,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- CORBA::Boolean is_local (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void is_local (
-- CORBA::Boolean is_local,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- CORBA::Boolean is_a (
-- const char * interface_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27337,14 +27132,14 @@
+ CORBA::SystemException
+ ));
+
- IR::AttributeDef_ptr create_attribute (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ 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 ()
+ )
+@@ -27352,15 +27147,15 @@
+ CORBA::SystemException
+ ));
+
- IR::OperationDef_ptr create_operation (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ 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 ()
+ )
+@@ -27368,7 +27163,7 @@
+ CORBA::SystemException
+ ));
+
- IR::Contained_ptr lookup (
-- const char * search_name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_Contained_ptr lookup (
+ const char * search_name,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -27377,8 +27172,8 @@
+ CORBA::SystemException
+ ));
+
- IR::ContainedSeq * contents (
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_ContainedSeq * contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -27387,10 +27182,10 @@
+ CORBA::SystemException
+ ));
+
- IR::ContainedSeq * lookup_name (
-- const char * search_name,
-- CORBA::Long levels_to_search,
++ IR_ContainedSeq * lookup_name (
+ const char * search_name,
+ CORBA::Long levels_to_search,
- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -27399,8 +27194,8 @@
+ CORBA::SystemException
+ ));
+
- 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
-- ));
--
++ IR_Container::DescriptionSeq * describe_contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Long max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -27410,7 +27205,7 @@
+ CORBA::SystemException
+ ));
+
- 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
-- ));
--
++ IR_ModuleDef_ptr create_module (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -27421,11 +27216,11 @@
+ CORBA::SystemException
+ ));
+
- IR::ConstantDef_ptr create_constant (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
--
++ IR_IDLType_ptr type,
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -27434,11 +27229,11 @@
+ CORBA::SystemException
+ ));
+
- IR::StructDef_ptr create_struct (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
--
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27446,12 +27241,12 @@
+ CORBA::SystemException
+ ));
+
- IR::UnionDef_ptr create_union (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
--
++ IR_IDLType_ptr discriminator_type,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27459,11 +27254,11 @@
+ CORBA::SystemException
+ ));
+
- IR::EnumDef_ptr create_enum (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
--
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27471,11 +27266,11 @@
+ CORBA::SystemException
+ ));
+
- IR::AliasDef_ptr create_alias (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
--
++ IR_IDLType_ptr original_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27483,11 +27278,11 @@
+ CORBA::SystemException
+ ));
+
- IR::InterfaceDef_ptr create_interface (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
--
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -27497,17 +27292,17 @@
+ CORBA::SystemException
+ ));
+
- 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 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,
++ 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
-- ));
--
++ const IR_ValueDefSeq & abstract_base_values,
++ const IR_InterfaceDefSeq & supported_interfaces,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27515,11 +27310,11 @@
+ CORBA::SystemException
+ ));
+
- IR::ValueBoxDef_ptr create_value_box (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
--
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27527,11 +27322,11 @@
+ CORBA::SystemException
+ ));
+
- IR::ExceptionDef_ptr create_exception (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
--
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27539,7 +27334,7 @@
+ CORBA::SystemException
+ ));
+
- 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
-- ));
--
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_NativeDef_ptr create_native (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -27601,7 +27396,7 @@
+ CORBA::SystemException
+ ));
+
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27617,7 +27412,7 @@
+ CORBA::SystemException
+ ));
+
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27625,7 +27420,7 @@
+ CORBA::SystemException
+ ));
+
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void move (
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27634,7 +27429,7 @@
+ ));
+
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- CORBA::TypeCode_ptr type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -27652,7 +27447,7 @@
+ CORBA::SystemException
+ ));
+
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- ComponentDef_tie (const ComponentDef_tie &);
-- void operator= (const ComponentDef_tie &);
--};
--
--#endif /* ACE_HAS_USING_KEYWORD */
--
--class PrimaryKeyDef;
--typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
--// Forward Classes Declaration
--class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
--class _TAO_PrimaryKeyDef_Strategized_Proxy_Broker;
--
--class PrimaryKeyDef : public virtual Contained
--{
--protected:
-- PrimaryKeyDef (void);
--
--public:
-- PrimaryKeyDef (const PrimaryKeyDef& rhs);
-- virtual ~PrimaryKeyDef (void);
--
--
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual void* _downcast (
-- 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 ()
-- );
--
-- static void _non_existent_skel (
-- 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 ()
-- );
--
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27686,7 +27481,7 @@
+ class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
+ class _TAO_PrimaryKeyDef_Strategized_Proxy_Broker;
+
+-class TAO_IFR_Client_Export PrimaryKeyDef : public virtual Contained
++ class PrimaryKeyDef : public virtual Contained
+ {
+ protected:
+ PrimaryKeyDef (void);
+@@ -27729,7 +27524,7 @@
+ TAO_default_environment ()
+ );
+
- ::IR::PrimaryKeyDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual const char* _interface_repository_id (void) const;
--
-- virtual CORBA::Boolean is_a (
-- const char * primary_key_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
-- static void is_a_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
++ IR_PrimaryKeyDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -27753,7 +27548,7 @@
+ TAO_default_environment ()
+ );
+
- virtual IR::ValueDef_ptr primary_key (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
-- static void _get_primary_key_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ virtual IR_ValueDef_ptr primary_key (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -27773,7 +27568,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -27781,7 +27576,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -27789,7 +27584,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -27797,7 +27592,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -27805,7 +27600,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -27813,7 +27608,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -27821,7 +27616,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -27829,7 +27624,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -27837,7 +27632,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -27845,7 +27640,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
--
--#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_ServerRequestInfo_IR_PrimaryKeyDef_is_a : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::PrimaryKeyDef;
-- TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::PrimaryKeyDef *tao_impl
-- ,
-- 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));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a (const TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a &);
-- void operator= (const TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a &);
--
-- private:
-- POA_IR::PrimaryKeyDef *_tao_impl;
-- const char * primary_key_id_;
--void result (CORBA::Boolean result);
-- // update the result
--CORBA::Boolean _result;
--};
--
--class TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::PrimaryKeyDef;
-- TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::PrimaryKeyDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual Dynamic::ParameterList * arguments (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -27853,7 +27648,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -27861,7 +27656,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -27869,11 +27664,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get (const TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get &);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
-
--private:
-- POA_IR::PrimaryKeyDef *_tao_impl;
-- void result (IR::ValueDef_ptr result);
-- // update the result
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -27980,27 +27774,26 @@
+ POA_IR::PrimaryKeyDef *_tao_impl;
+ void result (IR::ValueDef_ptr result);
+ // update the result
-IR::ValueDef_ptr _result;
--};
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
--};
--
--
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Declaration
--//
++ IR_ValueDef_ptr _result;
+ };
+
+ #endif /* TAO_HAS_INTERCEPTORS */
+
+ };
+
-
--class _TAO_PrimaryKeyDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_PrimaryKeyDef_Proxy_Broker
--{
--public:
-- _TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void);
--
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Declaration
+ //
+
+-class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_PrimaryKeyDef_Proxy_Broker
++class _TAO_PrimaryKeyDef_Strategized_Proxy_Broker : public virtual _TAO_PrimaryKeyDef_Proxy_Broker
+ {
+ public:
+ _TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
- ::IR::PrimaryKeyDef *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.
++ virtual _TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
++ IR_PrimaryKeyDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -28018,7 +27811,7 @@
+ // 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.
- ::IR::_TAO_PrimaryKeyDef_Proxy_Impl
-- *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
--
-- TAO_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:
-- static _TAO_PrimaryKeyDef_Strategized_Proxy_Broker *the_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void);
--};
--
--
--//
--// End Strategized Proxy Broker Declaration
--///////////////////////////////////////////////////////////////////////
--
--
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Impl. Declaration
--//
++ _TAO_PrimaryKeyDef_Proxy_Impl
+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
+
+ TAO_SYNCH_MUTEX mutex_;
+@@ -28030,7 +27823,6 @@
+ static _TAO_PrimaryKeyDef_Strategized_Proxy_Broker *the_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void);
+ };
+
-
--class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl :
+ //
+ // End Strategized Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -28040,8 +27832,8 @@
+ // ThruPOA Impl. Declaration
+ //
+
+-class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_PrimaryKeyDef_Proxy_Impl,
-- public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
--
--{
--public:
-- _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl (void);
--
-- virtual ~_TAO_PrimaryKeyDef_ThruPOA_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
-- ));
--
++class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_PrimaryKeyDef_Proxy_Impl,
+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
+ public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
+
+@@ -28060,7 +27852,7 @@
+ CORBA::SystemException
+ ));
+
- virtual IR::ValueDef_ptr primary_key (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
--};
--
--
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
--
++ virtual IR_ValueDef_ptr primary_key (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -28075,11 +27867,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+
-
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class PrimaryKeyDef_tie : public PrimaryKeyDef
--{
--public:
-- PrimaryKeyDef_tie (T &t);
-- // the T& ctor
-- PrimaryKeyDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- PrimaryKeyDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- PrimaryKeyDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~PrimaryKeyDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- CORBA::Boolean is_a (
-- const char * primary_key_id,
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export PrimaryKeyDef_tie : public PrimaryKeyDef
++ class PrimaryKeyDef_tie : public PrimaryKeyDef
+ {
+ public:
+ PrimaryKeyDef_tie (T &t);
+@@ -28107,7 +27898,7 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+ CORBA::Boolean is_a (
+@@ -28119,7 +27910,7 @@
+ CORBA::SystemException
+ ));
+
- IR::ValueDef_ptr primary_key (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_ValueDef_ptr primary_key (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28178,7 +27969,7 @@
+ CORBA::SystemException
+ ));
+
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28194,7 +27985,7 @@
+ CORBA::SystemException
+ ));
+
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28202,7 +27993,7 @@
+ CORBA::SystemException
+ ));
+
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void move (
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28211,7 +28002,7 @@
+ ));
+
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -28221,7 +28012,7 @@
+ CORBA::SystemException
+ ));
+
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- PrimaryKeyDef_tie (const PrimaryKeyDef_tie &);
-- void operator= (const PrimaryKeyDef_tie &);
--};
--
--#endif /* ACE_HAS_USING_KEYWORD */
--
--class FactoryDef;
--typedef FactoryDef *FactoryDef_ptr;
--// Forward Classes Declaration
--class _TAO_FactoryDef_ThruPOA_Proxy_Impl;
--class _TAO_FactoryDef_Strategized_Proxy_Broker;
--
--class FactoryDef : public virtual OperationDef
--{
--protected:
-- FactoryDef (void);
--
--public:
-- FactoryDef (const FactoryDef& rhs);
-- virtual ~FactoryDef (void);
--
--
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual void* _downcast (
-- 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 ()
-- );
--
-- static void _non_existent_skel (
-- 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 ()
-- );
--
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28255,7 +28046,7 @@
+ class _TAO_FactoryDef_ThruPOA_Proxy_Impl;
+ class _TAO_FactoryDef_Strategized_Proxy_Broker;
+
+-class TAO_IFR_Client_Export FactoryDef : public virtual OperationDef
++ class FactoryDef : public virtual OperationDef
+ {
+ protected:
+ FactoryDef (void);
+@@ -28298,7 +28089,7 @@
+ TAO_default_environment ()
+ );
+
- ::IR::FactoryDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual const char* _interface_repository_id (void) const;
--
-- static void _get_result_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ IR_FactoryDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -28309,7 +28100,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_result_def_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28317,7 +28108,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_result_def_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28325,7 +28116,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_params_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28333,7 +28124,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_params_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28341,7 +28132,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_mode_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28349,7 +28140,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_mode_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28357,7 +28148,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_contexts_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28365,7 +28156,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_contexts_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28373,7 +28164,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_exceptions_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28381,7 +28172,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_exceptions_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28389,7 +28180,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28397,7 +28188,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28405,7 +28196,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28413,7 +28204,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28421,7 +28212,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28429,7 +28220,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28437,7 +28228,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28445,7 +28236,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28453,7 +28244,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28461,7 +28252,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28469,7 +28260,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28477,7 +28268,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28485,7 +28276,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28493,11 +28284,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
-
--#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 */
--
--};
--
--
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Declaration
--//
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -28507,20 +28297,19 @@
+
+ };
+
-
--class _TAO_FactoryDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_FactoryDef_Proxy_Broker
--{
--public:
-- _TAO_FactoryDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_FactoryDef_Strategized_Proxy_Broker (void);
--
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Declaration
+ //
+
+-class TAO_IFR_Client_Export _TAO_FactoryDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_FactoryDef_Proxy_Broker
++class _TAO_FactoryDef_Strategized_Proxy_Broker : public virtual _TAO_FactoryDef_Proxy_Broker
+ {
+ public:
+ _TAO_FactoryDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_FactoryDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_FactoryDef_Proxy_Impl &select_proxy (
- ::IR::FactoryDef *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.
++ virtual _TAO_FactoryDef_Proxy_Impl &select_proxy (
++ IR_FactoryDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -28538,7 +28327,7 @@
+ // 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.
- ::IR::_TAO_FactoryDef_Proxy_Impl
-- *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
--
-- TAO_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:
-- static _TAO_FactoryDef_Strategized_Proxy_Broker *the_TAO_FactoryDef_Strategized_Proxy_Broker (void);
--};
--
--
--//
--// End Strategized Proxy Broker Declaration
--///////////////////////////////////////////////////////////////////////
--
--
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Impl. Declaration
--//
++ _TAO_FactoryDef_Proxy_Impl
+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
+
+ TAO_SYNCH_MUTEX mutex_;
+@@ -28550,7 +28339,6 @@
+ static _TAO_FactoryDef_Strategized_Proxy_Broker *the_TAO_FactoryDef_Strategized_Proxy_Broker (void);
+ };
+
-
--class _TAO_FactoryDef_ThruPOA_Proxy_Impl :
+ //
+ // End Strategized Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -28560,8 +28348,8 @@
+ // ThruPOA Impl. Declaration
+ //
+
+-class TAO_IFR_Client_Export _TAO_FactoryDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_FactoryDef_Proxy_Impl,
-- public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl
--
--{
--public:
-- _TAO_FactoryDef_ThruPOA_Proxy_Impl (void);
--
-- virtual ~_TAO_FactoryDef_ThruPOA_Proxy_Impl (void) { }
--
-- };
--
--
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
--
++class _TAO_FactoryDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_FactoryDef_Proxy_Impl,
+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
+ public virtual ::POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl
+
+@@ -28578,11 +28366,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+
-
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class FactoryDef_tie : public FactoryDef
--{
--public:
-- FactoryDef_tie (T &t);
-- // the T& ctor
-- FactoryDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- FactoryDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- FactoryDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~FactoryDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- CORBA::TypeCode_ptr result (
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export FactoryDef_tie : public FactoryDef
++ class FactoryDef_tie : public FactoryDef
+ {
+ public:
+ FactoryDef_tie (T &t);
+@@ -28610,7 +28397,7 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+ CORBA::TypeCode_ptr result (
+@@ -28621,7 +28408,7 @@
+ CORBA::SystemException
+ ));
+
- IR::IDLType_ptr result_def (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void result_def (
++ IR_IDLType_ptr result_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28630,7 +28417,7 @@
+ ));
+
+ void result_def (
- IR::IDLType_ptr result_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_IDLType_ptr result_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28638,7 +28425,7 @@
+ CORBA::SystemException
+ ));
+
- IR::ParDescriptionSeq * params (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void params (
++ IR_ParDescriptionSeq * params (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28647,7 +28434,7 @@
+ ));
+
+ void params (
- const IR::ParDescriptionSeq & params,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ const IR_ParDescriptionSeq & params,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28655,7 +28442,7 @@
+ CORBA::SystemException
+ ));
+
- IR::OperationMode mode (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void mode (
++ IR_OperationMode mode (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28664,7 +28451,7 @@
+ ));
+
+ void mode (
- IR::OperationMode mode,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_OperationMode mode,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28672,7 +28459,7 @@
+ CORBA::SystemException
+ ));
+
- IR::ContextIdSeq * contexts (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void contexts (
++ IR_ContextIdSeq * contexts (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28681,7 +28468,7 @@
+ ));
+
+ void contexts (
- const IR::ContextIdSeq & contexts,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28689,7 +28476,7 @@
+ CORBA::SystemException
+ ));
+
- IR::ExceptionDefSeq * exceptions (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void exceptions (
++ IR_ExceptionDefSeq * exceptions (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28698,7 +28485,7 @@
+ ));
+
+ void exceptions (
- const IR::ExceptionDefSeq & exceptions,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28757,7 +28544,7 @@
+ CORBA::SystemException
+ ));
+
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28773,7 +28560,7 @@
+ CORBA::SystemException
+ ));
+
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28781,7 +28568,7 @@
+ CORBA::SystemException
+ ));
+
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void move (
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28790,7 +28577,7 @@
+ ));
+
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -28800,7 +28587,7 @@
+ CORBA::SystemException
+ ));
+
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- FactoryDef_tie (const FactoryDef_tie &);
-- void operator= (const FactoryDef_tie &);
--};
--
--#endif /* ACE_HAS_USING_KEYWORD */
--
--class FinderDef;
--typedef FinderDef *FinderDef_ptr;
--// Forward Classes Declaration
--class _TAO_FinderDef_ThruPOA_Proxy_Impl;
--class _TAO_FinderDef_Strategized_Proxy_Broker;
--
--class FinderDef : public virtual OperationDef
--{
--protected:
-- FinderDef (void);
--
--public:
-- FinderDef (const FinderDef& rhs);
-- virtual ~FinderDef (void);
--
--
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual void* _downcast (
-- 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 ()
-- );
--
-- static void _non_existent_skel (
-- 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 ()
-- );
--
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28834,7 +28621,7 @@
+ class _TAO_FinderDef_ThruPOA_Proxy_Impl;
+ class _TAO_FinderDef_Strategized_Proxy_Broker;
+
+-class TAO_IFR_Client_Export FinderDef : public virtual OperationDef
++ class FinderDef : public virtual OperationDef
+ {
+ protected:
+ FinderDef (void);
+@@ -28877,7 +28664,7 @@
+ TAO_default_environment ()
+ );
+
- ::IR::FinderDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual const char* _interface_repository_id (void) const;
--
-- static void _get_result_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ IR_FinderDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -28888,7 +28675,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_result_def_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28896,7 +28683,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_result_def_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28904,7 +28691,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_params_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28912,7 +28699,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_params_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28920,7 +28707,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_mode_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28928,7 +28715,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_mode_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28936,7 +28723,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_contexts_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28944,7 +28731,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_contexts_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28952,7 +28739,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_exceptions_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28960,7 +28747,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_exceptions_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28968,7 +28755,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28976,7 +28763,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28984,7 +28771,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -28992,7 +28779,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29000,7 +28787,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29008,7 +28795,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29016,7 +28803,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29024,7 +28811,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29032,7 +28819,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29040,7 +28827,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29048,7 +28835,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29056,7 +28843,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29064,7 +28851,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29072,11 +28859,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
-
--#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 */
--
--};
--
--
--///////////////////////////////////////////////////////////////////////
--// Strategized Proxy Broker Declaration
--//
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -29086,20 +28872,19 @@
+
+ };
+
-
--class _TAO_FinderDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_FinderDef_Proxy_Broker
--{
--public:
-- _TAO_FinderDef_Strategized_Proxy_Broker (void);
--
-- virtual ~_TAO_FinderDef_Strategized_Proxy_Broker (void);
--
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Declaration
+ //
+
+-class TAO_IFR_Client_Export _TAO_FinderDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_FinderDef_Proxy_Broker
++class _TAO_FinderDef_Strategized_Proxy_Broker : public virtual _TAO_FinderDef_Proxy_Broker
+ {
+ public:
+ _TAO_FinderDef_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_FinderDef_Strategized_Proxy_Broker (void);
+
- virtual ::IR::_TAO_FinderDef_Proxy_Impl &select_proxy (
- ::IR::FinderDef *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.
++ virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
++ IR_FinderDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -29117,7 +28902,7 @@
+ // 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.
- ::IR::_TAO_FinderDef_Proxy_Impl
-- *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
--
-- TAO_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:
-- static _TAO_FinderDef_Strategized_Proxy_Broker *the_TAO_FinderDef_Strategized_Proxy_Broker (void);
--};
--
--
--//
--// End Strategized Proxy Broker Declaration
--///////////////////////////////////////////////////////////////////////
--
--
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Impl. Declaration
--//
++ _TAO_FinderDef_Proxy_Impl
+ *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
+
+ TAO_SYNCH_MUTEX mutex_;
+@@ -29129,7 +28914,6 @@
+ static _TAO_FinderDef_Strategized_Proxy_Broker *the_TAO_FinderDef_Strategized_Proxy_Broker (void);
+ };
+
-
--class _TAO_FinderDef_ThruPOA_Proxy_Impl :
+ //
+ // End Strategized Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -29139,8 +28923,8 @@
+ // ThruPOA Impl. Declaration
+ //
+
+-class TAO_IFR_Client_Export _TAO_FinderDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_FinderDef_Proxy_Impl,
-- public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl
--
--{
--public:
-- _TAO_FinderDef_ThruPOA_Proxy_Impl (void);
--
-- virtual ~_TAO_FinderDef_ThruPOA_Proxy_Impl (void) { }
--
-- };
--
--
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
--
++class _TAO_FinderDef_ThruPOA_Proxy_Impl :
++ public virtual _TAO_FinderDef_Proxy_Impl,
+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
+ public virtual ::POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl
+
+@@ -29157,11 +28941,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+
-
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class FinderDef_tie : public FinderDef
--{
--public:
-- FinderDef_tie (T &t);
-- // the T& ctor
-- FinderDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- FinderDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- FinderDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~FinderDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- CORBA::TypeCode_ptr result (
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export FinderDef_tie : public FinderDef
++ class FinderDef_tie : public FinderDef
+ {
+ public:
+ FinderDef_tie (T &t);
+@@ -29189,7 +28972,7 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+ CORBA::TypeCode_ptr result (
+@@ -29200,7 +28983,7 @@
+ CORBA::SystemException
+ ));
+
- IR::IDLType_ptr result_def (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void result_def (
++ IR_IDLType_ptr result_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29209,7 +28992,7 @@
+ ));
+
+ void result_def (
- IR::IDLType_ptr result_def,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_IDLType_ptr result_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29217,7 +29000,7 @@
+ CORBA::SystemException
+ ));
+
- IR::ParDescriptionSeq * params (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void params (
++ IR_ParDescriptionSeq * params (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29226,7 +29009,7 @@
+ ));
+
+ void params (
- const IR::ParDescriptionSeq & params,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ const IR_ParDescriptionSeq & params,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29234,7 +29017,7 @@
+ CORBA::SystemException
+ ));
+
- IR::OperationMode mode (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void mode (
++ IR_OperationMode mode (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29243,7 +29026,7 @@
+ ));
+
+ void mode (
- IR::OperationMode mode,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_OperationMode mode,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29251,7 +29034,7 @@
+ CORBA::SystemException
+ ));
+
- IR::ContextIdSeq * contexts (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void contexts (
++ IR_ContextIdSeq * contexts (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29260,7 +29043,7 @@
+ ));
+
+ void contexts (
- const IR::ContextIdSeq & contexts,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29268,7 +29051,7 @@
+ CORBA::SystemException
+ ));
+
- IR::ExceptionDefSeq * exceptions (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void exceptions (
++ IR_ExceptionDefSeq * exceptions (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29277,7 +29060,7 @@
+ ));
+
+ void exceptions (
- const IR::ExceptionDefSeq & exceptions,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29336,7 +29119,7 @@
+ CORBA::SystemException
+ ));
+
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29352,7 +29135,7 @@
+ CORBA::SystemException
+ ));
+
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29360,7 +29143,7 @@
+ CORBA::SystemException
+ ));
+
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void move (
++ IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29369,7 +29152,7 @@
+ ));
+
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -29379,7 +29162,7 @@
+ CORBA::SystemException
+ ));
+
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
--private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- FinderDef_tie (const FinderDef_tie &);
-- void operator= (const FinderDef_tie &);
--};
--
--#endif /* ACE_HAS_USING_KEYWORD */
--
--class HomeDef;
--typedef HomeDef *HomeDef_ptr;
--// Forward Classes Declaration
--class _TAO_HomeDef_ThruPOA_Proxy_Impl;
--class _TAO_HomeDef_Strategized_Proxy_Broker;
--
--class HomeDef : public virtual InterfaceDef
--{
--protected:
-- HomeDef (void);
--
--public:
-- HomeDef (const HomeDef& rhs);
-- virtual ~HomeDef (void);
--
--
-- virtual CORBA::Boolean _is_a (
-- const char* logical_type_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual void* _downcast (
-- 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 ()
-- );
--
-- static void _non_existent_skel (
-- 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 ()
-- );
--
++ IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29413,7 +29196,7 @@
+ class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+ class _TAO_HomeDef_Strategized_Proxy_Broker;
+
+-class TAO_IFR_Client_Export HomeDef : public virtual InterfaceDef
++ class HomeDef : public virtual InterfaceDef
+ {
+ protected:
+ HomeDef (void);
+@@ -29456,14 +29239,14 @@
+ TAO_default_environment ()
+ );
+
- ::IR::HomeDef *_this (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual const char* _interface_repository_id (void) const;
--
++ IR_HomeDef *_this (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+
+ virtual const char* _interface_repository_id (void) const;
+
- virtual IR::HomeDef_ptr base_home (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
-- static void _get_base_home_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
++ virtual IR_HomeDef_ptr base_home (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29479,7 +29262,7 @@
+ TAO_default_environment ()
+ );
+
- virtual IR::ComponentDef_ptr managed_component (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
-- static void _get_managed_component_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
++ virtual IR_ComponentDef_ptr managed_component (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29495,7 +29278,7 @@
+ TAO_default_environment ()
+ );
+
- virtual IR::PrimaryKeyDef_ptr primary_key (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
-- static void _get_primary_key_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
++ virtual IR_PrimaryKeyDef_ptr primary_key (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29511,7 +29294,7 @@
+ TAO_default_environment ()
+ );
+
- virtual IR::FactoryDefSeq * factories (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
-- static void _get_factories_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
++ virtual IR_FactoryDefSeq * factories (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29527,7 +29310,7 @@
+ TAO_default_environment ()
+ );
+
- virtual IR::FinderDefSeq * finders (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
-- static void _get_finders_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual CORBA::Boolean is_basic (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
-- static void _get_is_basic_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
++ virtual IR_FinderDefSeq * finders (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29559,11 +29342,11 @@
+ TAO_default_environment ()
+ );
+
- virtual IR::PrimaryKeyDef_ptr create_primary_key (
-- const char * id,
-- const char * name,
-- const char * version,
++ virtual IR_PrimaryKeyDef_ptr create_primary_key (
+ const char * id,
+ const char * name,
+ const char * version,
- IR::ValueDef_ptr primary_key,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
-- static void create_primary_key_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
++ IR_ValueDef_ptr primary_key,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29579,12 +29362,12 @@
+ TAO_default_environment ()
+ );
+
- virtual IR::FactoryDef_ptr create_factory (
-- const char * id,
-- const char * name,
-- const char * version,
++ virtual IR_FactoryDef_ptr create_factory (
+ 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 ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
-- static void create_factory_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29600,12 +29383,12 @@
+ TAO_default_environment ()
+ );
+
- virtual IR::FinderDef_ptr create_finder (
-- const char * id,
-- const char * name,
-- const char * version,
++ virtual IR_FinderDef_ptr create_finder (
+ 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 ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
-- static void create_finder_skel (
-- TAO_ServerRequest &_tao_req,
-- void *_tao_obj,
-- void *_tao_context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_base_interfaces_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -29625,7 +29408,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_base_interfaces_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29633,7 +29416,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_is_abstract_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29641,7 +29424,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_is_abstract_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29649,7 +29432,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_is_local_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29657,7 +29440,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_is_local_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29665,7 +29448,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void is_a_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29673,7 +29456,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_attribute_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29681,7 +29464,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_operation_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29689,7 +29472,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void lookup_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29697,7 +29480,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void contents_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29705,7 +29488,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void lookup_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29713,7 +29496,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void describe_contents_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29721,7 +29504,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_module_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29729,7 +29512,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_constant_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29737,7 +29520,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_struct_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29745,7 +29528,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_union_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29753,7 +29536,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_enum_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29761,7 +29544,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_alias_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29769,7 +29552,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_interface_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29777,7 +29560,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_value_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29785,7 +29568,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_value_box_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29793,7 +29576,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_exception_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29801,7 +29584,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void create_native_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29809,7 +29592,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29817,7 +29600,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_id_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29825,7 +29608,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29833,7 +29616,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29841,7 +29624,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29849,7 +29632,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _set_version_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29857,7 +29640,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_defined_in_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_absolute_name_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_containing_repository_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void describe_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29865,7 +29648,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void move_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29873,7 +29656,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_type_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29881,7 +29664,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void _get_def_kind_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29889,7 +29672,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- static void destroy_skel (
-- TAO_ServerRequest &req,
-- void *obj,
-- void *context,
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29897,7 +29680,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
--
--#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_ServerRequestInfo_IR_HomeDef_base_home_get : public TAO_ServerRequestInfo
-- {
-- public:
-- friend class POA_IR::HomeDef;
-- TAO_ServerRequestInfo_IR_HomeDef_base_home_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::HomeDef *tao_impl
-- ,
-- 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 =
-+ static void _get_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
+ CORBA::Environment &env =
- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
-- private:
-- TAO_ServerRequestInfo_IR_HomeDef_base_home_get (const TAO_ServerRequestInfo_IR_HomeDef_base_home_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_HomeDef_base_home_get &);
--
-- private:
-- POA_IR::HomeDef *_tao_impl;
-- void result (IR::HomeDef_ptr result);
-- // update the result
--IR::HomeDef_ptr _result;
--};
--
--class TAO_ServerRequestInfo_IR_HomeDef_managed_component_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::HomeDef;
-- TAO_ServerRequestInfo_IR_HomeDef_managed_component_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::HomeDef *tao_impl
-- ,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
--
-- virtual Dynamic::ParameterList * arguments (
+ TAO_default_environment ()
+ );
+
+@@ -29905,7 +29688,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual Dynamic::ExceptionList * exceptions (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29913,7 +29696,7 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Any * result (
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
+@@ -29921,11 +29704,10 @@
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_HomeDef_managed_component_get (const TAO_ServerRequestInfo_IR_HomeDef_managed_component_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_HomeDef_managed_component_get &);
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+
-
--private:
-- POA_IR::HomeDef *_tao_impl;
-- void result (IR::ComponentDef_ptr result);
-- // update the result
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+ // This needed to be able to store the arguments, exceptions, contexts
+@@ -29979,7 +29761,7 @@
+ POA_IR::HomeDef *_tao_impl;
+ void result (IR::HomeDef_ptr result);
+ // update the result
+-IR::HomeDef_ptr _result;
++ IR_HomeDef_ptr _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_HomeDef_managed_component_get : public TAO_ServerRequestInfo
+@@ -30030,7 +29812,7 @@
+ POA_IR::HomeDef *_tao_impl;
+ void result (IR::ComponentDef_ptr result);
+ // update the result
-IR::ComponentDef_ptr _result;
--};
--
--class TAO_ServerRequestInfo_IR_HomeDef_primary_key_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::HomeDef;
-- TAO_ServerRequestInfo_IR_HomeDef_primary_key_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::HomeDef *tao_impl
-- ,
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_HomeDef_primary_key_get (const TAO_ServerRequestInfo_IR_HomeDef_primary_key_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_HomeDef_primary_key_get &);
--
--private:
-- POA_IR::HomeDef *_tao_impl;
-- void result (IR::PrimaryKeyDef_ptr result);
-- // update the result
++ IR_ComponentDef_ptr _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_HomeDef_primary_key_get : public TAO_ServerRequestInfo
+@@ -30081,7 +29863,7 @@
+ POA_IR::HomeDef *_tao_impl;
+ void result (IR::PrimaryKeyDef_ptr result);
+ // update the result
-IR::PrimaryKeyDef_ptr _result;
--};
--
--class TAO_ServerRequestInfo_IR_HomeDef_factories_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::HomeDef;
-- TAO_ServerRequestInfo_IR_HomeDef_factories_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::HomeDef *tao_impl
-- ,
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_HomeDef_factories_get (const TAO_ServerRequestInfo_IR_HomeDef_factories_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_HomeDef_factories_get &);
--
--private:
-- POA_IR::HomeDef *_tao_impl;
-- void result (IR::FactoryDefSeq * result);
-- // update the result
++ IR_PrimaryKeyDef_ptr _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_HomeDef_factories_get : public TAO_ServerRequestInfo
+@@ -30132,7 +29914,7 @@
+ POA_IR::HomeDef *_tao_impl;
+ void result (IR::FactoryDefSeq * result);
+ // update the result
-IR::FactoryDefSeq * _result;
--};
--
--class TAO_ServerRequestInfo_IR_HomeDef_finders_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::HomeDef;
-- TAO_ServerRequestInfo_IR_HomeDef_finders_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::HomeDef *tao_impl
-- ,
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_HomeDef_finders_get (const TAO_ServerRequestInfo_IR_HomeDef_finders_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_HomeDef_finders_get &);
--
--private:
-- POA_IR::HomeDef *_tao_impl;
-- void result (IR::FinderDefSeq * result);
-- // update the result
++ IR_FactoryDefSeq * _result;
+ };
+
+ class TAO_ServerRequestInfo_IR_HomeDef_finders_get : public TAO_ServerRequestInfo
+@@ -30183,7 +29965,7 @@
+ POA_IR::HomeDef *_tao_impl;
+ void result (IR::FinderDefSeq * result);
+ // update the result
-IR::FinderDefSeq * _result;
--};
--
--class TAO_ServerRequestInfo_IR_HomeDef_is_basic_get : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::HomeDef;
-- TAO_ServerRequestInfo_IR_HomeDef_is_basic_get (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::HomeDef *tao_impl
-- ,
-- 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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_HomeDef_is_basic_get (const TAO_ServerRequestInfo_IR_HomeDef_is_basic_get &);
-- void operator= (const TAO_ServerRequestInfo_IR_HomeDef_is_basic_get &);
--
--private:
-- POA_IR::HomeDef *_tao_impl;
-- void result (CORBA::Boolean result);
-- // update the result
--CORBA::Boolean _result;
--};
-+ );
++ IR_FinderDefSeq * _result;
+ };
--class TAO_ServerRequestInfo_IR_HomeDef_create_primary_key : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::HomeDef;
-- TAO_ServerRequestInfo_IR_HomeDef_create_primary_key (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::HomeDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
+ class TAO_ServerRequestInfo_IR_HomeDef_is_basic_get : public TAO_ServerRequestInfo
+@@ -30248,7 +30030,7 @@
+ const char * id,
+ const char * name,
+ const char * version,
- IR::ValueDef_ptr primary_key,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ static void _set_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_HomeDef_create_primary_key (const TAO_ServerRequestInfo_IR_HomeDef_create_primary_key &);
-- void operator= (const TAO_ServerRequestInfo_IR_HomeDef_create_primary_key &);
--
--private:
-- POA_IR::HomeDef *_tao_impl;
-- const char * id_;
--const char * name_;
--const char * version_;
++ IR_ValueDef_ptr primary_key,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -30290,10 +30072,10 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
-IR::ValueDef_ptr primary_key_;
--void result (IR::PrimaryKeyDef_ptr result);
-- // update the result
++ IR_ValueDef_ptr primary_key_;
+ void result (IR::PrimaryKeyDef_ptr result);
+ // update the result
-IR::PrimaryKeyDef_ptr _result;
--};
-+ static void _get_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_PrimaryKeyDef_ptr _result;
+ };
--class TAO_ServerRequestInfo_IR_HomeDef_create_factory : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::HomeDef;
-- TAO_ServerRequestInfo_IR_HomeDef_create_factory (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::HomeDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
+ class TAO_ServerRequestInfo_IR_HomeDef_create_factory : public TAO_ServerRequestInfo
+@@ -30307,8 +30089,8 @@
+ 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 ()
-- );
-+ static void _set_version_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_HomeDef_create_factory (const TAO_ServerRequestInfo_IR_HomeDef_create_factory &);
-- void operator= (const TAO_ServerRequestInfo_IR_HomeDef_create_factory &);
--
--private:
-- POA_IR::HomeDef *_tao_impl;
-- 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 ()
+ );
+@@ -30350,11 +30132,11 @@
+ 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
++ const IR_ParDescriptionSeq & params_;
++ const IR_ExceptionDefSeq & exceptions_;
+ void result (IR::FactoryDef_ptr result);
+ // update the result
-IR::FactoryDef_ptr _result;
--};
-+ static void _get_defined_in_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_FactoryDef_ptr _result;
+ };
--class TAO_ServerRequestInfo_IR_HomeDef_create_finder : public TAO_ServerRequestInfo
--{
--public:
-- friend class POA_IR::HomeDef;
-- TAO_ServerRequestInfo_IR_HomeDef_create_finder (
-- TAO_ServerRequest &_tao_server_request,
-- POA_IR::HomeDef *tao_impl
-- ,
-- const char * id,
-- const char * name,
-- const char * version,
+ class TAO_ServerRequestInfo_IR_HomeDef_create_finder : public TAO_ServerRequestInfo
+@@ -30368,8 +30150,8 @@
+ 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 ()
-- );
-+ static void _get_absolute_name_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &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 char * target_most_derived_interface (
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
-- virtual CORBA::Boolean target_is_a (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-- ACE_THROW_SPEC ((CORBA::SystemException));
--
--
--private:
-- TAO_ServerRequestInfo_IR_HomeDef_create_finder (const TAO_ServerRequestInfo_IR_HomeDef_create_finder &);
-- void operator= (const TAO_ServerRequestInfo_IR_HomeDef_create_finder &);
--
--private:
-- POA_IR::HomeDef *_tao_impl;
-- 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 ()
+ );
+@@ -30411,31 +30193,30 @@
+ 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
++ const IR_ParDescriptionSeq & params_;
++ const IR_ExceptionDefSeq & exceptions_;
+ void result (IR::FinderDef_ptr result);
+ // update the result
-IR::FinderDef_ptr _result;
--};
-+ static void _get_containing_repository_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
++ IR_FinderDef_ptr _result;
+ };
--#endif /* TAO_HAS_INTERCEPTORS */
-+ static void describe_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ #endif /* TAO_HAS_INTERCEPTORS */
--};
-+ static void move_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_type_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+
-+ static void _get_def_kind_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-
-+ static void destroy_skel (
-+ TAO_ServerRequest &req,
-+ void *obj,
-+ void *context,
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
-+ };
+ };
+-
///////////////////////////////////////////////////////////////////////
// Strategized Proxy Broker Declaration
//
--class _TAO_HomeDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_HomeDef_Proxy_Broker
+-class TAO_IFR_Client_Export _TAO_HomeDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_HomeDef_Proxy_Broker
+class _TAO_HomeDef_Strategized_Proxy_Broker : public virtual _TAO_HomeDef_Proxy_Broker
{
public:
_TAO_HomeDef_Strategized_Proxy_Broker (void);
--
-+
+
virtual ~_TAO_HomeDef_Strategized_Proxy_Broker (void);
--
+
- virtual ::IR::_TAO_HomeDef_Proxy_Impl &select_proxy (
- ::IR::HomeDef *object,
-+
+ virtual _TAO_HomeDef_Proxy_Impl &select_proxy (
+ IR_HomeDef *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -30453,7 +21646,7 @@
+@@ -30453,7 +30234,7 @@
// 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.
@@ -47318,7 +17157,7 @@
*proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
TAO_SYNCH_MUTEX mutex_;
-@@ -30465,641 +21658,639 @@
+@@ -30465,7 +30246,6 @@
static _TAO_HomeDef_Strategized_Proxy_Broker *the_TAO_HomeDef_Strategized_Proxy_Broker (void);
};
@@ -47326,1193 +17165,522 @@
//
// End Strategized Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
+@@ -30475,8 +30255,8 @@
+ // ThruPOA Impl. Declaration
+ //
-
--///////////////////////////////////////////////////////////////////////
--// ThruPOA Impl. Declaration
--//
--
--class _TAO_HomeDef_ThruPOA_Proxy_Impl :
+-class TAO_IFR_Client_Export _TAO_HomeDef_ThruPOA_Proxy_Impl :
- public virtual ::IR::_TAO_HomeDef_Proxy_Impl,
-- public virtual TAO_ThruPOA_Object_Proxy_Impl,
-- public virtual ::POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl
--
--{
--public:
-- _TAO_HomeDef_ThruPOA_Proxy_Impl (void);
--
-- virtual ~_TAO_HomeDef_ThruPOA_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_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- 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_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- virtual IR::FinderDefSeq * finders (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- virtual CORBA::Boolean is_basic (
-- 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
-- )
-- 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
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- 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
-- ));
--
--};
--
--
--//
--// ThruPOA Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
--
--
--#if defined (ACE_HAS_USING_KEYWORD)
--// TIE class: Refer to CORBA v2.2, Section 20.34.4
--template <class T>
--class HomeDef_tie : public HomeDef
--{
--public:
-- HomeDef_tie (T &t);
-- // the T& ctor
-- HomeDef_tie (T &t, PortableServer::POA_ptr poa);
-- // ctor taking a POA
-- HomeDef_tie (T *tp, CORBA::Boolean release=1);
-- // ctor taking pointer and an ownership flag
-- HomeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-- // ctor with T*, ownership flag and a POA
-- ~HomeDef_tie (void);
-- // dtor
--
-- // TIE specific functions
-- T *_tied_object (void);
-- // return the underlying object
-- void _tied_object (T &obj);
-- // set the underlying object
-- void _tied_object (T *obj, CORBA::Boolean release=1);
-- // set the underlying object and the ownership flag
-- CORBA::Boolean _is_owner (void);
-- // do we own it
-- void _is_owner (CORBA::Boolean b);
-- // set the ownership
--
-- // overridden ServantBase operations
-- PortableServer::POA_ptr _default_POA (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-- IR::HomeDef_ptr base_home (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- IR::ComponentDef_ptr managed_component (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- IR::PrimaryKeyDef_ptr primary_key (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- IR::FactoryDefSeq * factories (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- IR::FinderDefSeq * finders (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- CORBA::Boolean is_basic (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- IR::PrimaryKeyDef_ptr create_primary_key (
-- const char * id,
-- const char * name,
-- const char * version,
-- IR::ValueDef_ptr primary_key,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- IR::FactoryDef_ptr create_factory (
-- 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 ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- IR::FinderDef_ptr create_finder (
-- 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 ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- IR::InterfaceDefSeq * base_interfaces (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void base_interfaces (
-- const IR::InterfaceDefSeq & base_interfaces,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- CORBA::Boolean is_abstract (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void is_abstract (
-- CORBA::Boolean is_abstract,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- CORBA::Boolean is_local (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- void is_local (
-- CORBA::Boolean is_local,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- CORBA::Boolean is_a (
-- const char * interface_id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- 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,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
--
-- 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,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+///////////////////////////////////////////////////////////////////////
-+// ThruPOA Impl. Declaration
-+//
-
-- IR::Contained_ptr lookup (
-- const char * search_name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
+class _TAO_HomeDef_ThruPOA_Proxy_Impl :
+ public virtual _TAO_HomeDef_Proxy_Impl,
-+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
-+ public virtual ::POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl
-+
-+{
-+public:
-+ _TAO_HomeDef_ThruPOA_Proxy_Impl (void);
-+
-+ virtual ~_TAO_HomeDef_ThruPOA_Proxy_Impl (void);
-+
+ public virtual TAO_ThruPOA_Object_Proxy_Impl,
+ public virtual ::POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl
+
+@@ -30486,7 +30266,7 @@
+
+ virtual ~_TAO_HomeDef_ThruPOA_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
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
+@@ -30494,7 +30274,7 @@
CORBA::SystemException
));
-- IR::ContainedSeq * contents (
-- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
+- virtual IR::ComponentDef_ptr managed_component (
+ virtual IR_ComponentDef_ptr managed_component (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
+@@ -30502,7 +30282,7 @@
CORBA::SystemException
));
-- IR::ContainedSeq * lookup_name (
-- const char * search_name,
-- CORBA::Long levels_to_search,
-- IR::DefinitionKind limit_type,
-- CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
+- virtual IR::PrimaryKeyDef_ptr primary_key (
+ virtual IR_PrimaryKeyDef_ptr primary_key (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
+@@ -30510,7 +30290,7 @@
CORBA::SystemException
));
-- 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 ()
+- virtual IR::FactoryDefSeq * factories (
+ virtual IR_FactoryDefSeq * factories (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
+@@ -30518,7 +30298,7 @@
CORBA::SystemException
));
-- IR::ModuleDef_ptr create_module (
-- const char * id,
-- const char * name,
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
+- virtual IR::FinderDefSeq * finders (
+ virtual IR_FinderDefSeq * finders (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-- 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 ()
-+ virtual CORBA::Boolean is_basic (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
+@@ -30534,38 +30314,38 @@
CORBA::SystemException
));
-- IR::StructDef_ptr create_struct (
+- virtual IR::PrimaryKeyDef_ptr create_primary_key (
+ virtual IR_PrimaryKeyDef_ptr create_primary_key (
-+ CORBA_Object *_collocated_tao_target_,
+ 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 ()
+- IR::ValueDef_ptr primary_key,
+ IR_ValueDef_ptr primary_key,
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
-- IR::UnionDef_ptr create_union (
+- virtual IR::FactoryDef_ptr create_factory (
+ virtual IR_FactoryDef_ptr create_factory (
-+ CORBA_Object *_collocated_tao_target_,
+ 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 ()
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
+ const IR_ParDescriptionSeq & params,
+ const IR_ExceptionDefSeq & exceptions,
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
-- IR::EnumDef_ptr create_enum (
+- virtual IR::FinderDef_ptr create_finder (
+ virtual IR_FinderDef_ptr create_finder (
-+ CORBA_Object *_collocated_tao_target_,
+ 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 ()
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
+ const IR_ParDescriptionSeq & params,
+ const IR_ExceptionDefSeq & exceptions,
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
+@@ -30579,11 +30359,10 @@
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
-- 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
-- ));
-+};
-+
-+
-+//
-+// ThruPOA Proxy Impl. Declaration
-+///////////////////////////////////////////////////////////////////////
-+
-+#if defined (ACE_HAS_USING_KEYWORD)
-+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
-+ template <class T>
+-
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_IFR_Client_Export HomeDef_tie : public HomeDef
+ class HomeDef_tie : public HomeDef
-+ {
-+ public:
-+ HomeDef_tie (T &t);
-+ // the T& ctor
-+ HomeDef_tie (T &t, PortableServer::POA_ptr poa);
-+ // ctor taking a POA
-+ HomeDef_tie (T *tp, CORBA::Boolean release=1);
-+ // ctor taking pointer and an ownership flag
-+ HomeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-+ // ctor with T*, ownership flag and a POA
-+ ~HomeDef_tie (void);
-+ // dtor
-+
-+ // TIE specific functions
-+ T *_tied_object (void);
-+ // return the underlying object
-+ void _tied_object (T &obj);
-+ // set the underlying object
-+ void _tied_object (T *obj, CORBA::Boolean release=1);
-+ // set the underlying object and the ownership flag
-+ CORBA::Boolean _is_owner (void);
-+ // do we own it
-+ void _is_owner (CORBA::Boolean b);
-+ // set the ownership
-+
-+ // overridden ServantBase operations
-+ PortableServer::POA_ptr _default_POA (
-+ CORBA::Environment &env =
-+ TAO_default_environment ()
-+ );
+ {
+ public:
+ HomeDef_tie (T &t);
+@@ -30611,10 +30390,10 @@
+
+ // overridden ServantBase operations
+ PortableServer::POA_ptr _default_POA (
+- CORBA::Environment &ACE_TRY_ENV =
++ CORBA::Environment &env =
+ TAO_default_environment ()
+ );
+- IR::HomeDef_ptr base_home (
+ IR_HomeDef_ptr base_home (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -30622,7 +30401,7 @@
+ CORBA::SystemException
+ ));
+
+- IR::ComponentDef_ptr managed_component (
+ IR_ComponentDef_ptr managed_component (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -30630,7 +30409,7 @@
+ CORBA::SystemException
+ ));
+
+- IR::PrimaryKeyDef_ptr primary_key (
+ IR_PrimaryKeyDef_ptr primary_key (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -30638,7 +30417,7 @@
+ CORBA::SystemException
+ ));
+
+- IR::FactoryDefSeq * factories (
+ IR_FactoryDefSeq * factories (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -30646,7 +30425,7 @@
+ CORBA::SystemException
+ ));
+
+- IR::FinderDefSeq * finders (
+ IR_FinderDefSeq * finders (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ CORBA::Boolean is_basic (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -30662,11 +30441,11 @@
+ CORBA::SystemException
+ ));
+
+- IR::PrimaryKeyDef_ptr create_primary_key (
+ IR_PrimaryKeyDef_ptr create_primary_key (
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -30674,12 +30453,12 @@
+ CORBA::SystemException
+ ));
+
+- IR::FactoryDef_ptr create_factory (
+ IR_FactoryDef_ptr create_factory (
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -30687,12 +30466,12 @@
+ CORBA::SystemException
+ ));
+
+- IR::FinderDef_ptr create_finder (
+ IR_FinderDef_ptr create_finder (
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -30700,7 +30479,7 @@
+ CORBA::SystemException
+ ));
+
+- IR::InterfaceDefSeq * base_interfaces (
+ IR_InterfaceDefSeq * base_interfaces (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ void base_interfaces (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -30709,7 +30488,7 @@
+ ));
+
+ void base_interfaces (
+- const IR::InterfaceDefSeq & base_interfaces,
+ const IR_InterfaceDefSeq & base_interfaces,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ CORBA::Boolean is_abstract (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ void is_abstract (
-+ CORBA::Boolean is_abstract,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ CORBA::Boolean is_local (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ void is_local (
-+ CORBA::Boolean is_local,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
-+ CORBA::Boolean is_a (
-+ const char * interface_id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -30760,14 +30539,14 @@
+ CORBA::SystemException
+ ));
+
+- IR::AttributeDef_ptr create_attribute (
+ IR_AttributeDef_ptr create_attribute (
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -30775,15 +30554,15 @@
+ CORBA::SystemException
+ ));
+
+- IR::OperationDef_ptr create_operation (
+ IR_OperationDef_ptr create_operation (
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -30791,7 +30570,7 @@
+ CORBA::SystemException
+ ));
+
+- IR::Contained_ptr lookup (
+ IR_Contained_ptr lookup (
-+ const char * search_name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
+ const char * search_name,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -30800,8 +30579,8 @@
+ CORBA::SystemException
+ ));
+
+- IR::ContainedSeq * contents (
+- IR::DefinitionKind limit_type,
+ IR_ContainedSeq * contents (
+ IR_DefinitionKind limit_type,
-+ CORBA::Boolean exclude_inherited,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -30810,10 +30589,10 @@
+ CORBA::SystemException
+ ));
+
+- IR::ContainedSeq * lookup_name (
+ IR_ContainedSeq * lookup_name (
-+ const char * search_name,
-+ CORBA::Long levels_to_search,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -30822,8 +30601,8 @@
+ CORBA::SystemException
+ ));
+
+- IR::Container::DescriptionSeq * describe_contents (
+- IR::DefinitionKind limit_type,
+ 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
-+ ));
-+
+ CORBA::Boolean exclude_inherited,
+ CORBA::Long max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -30833,7 +30612,7 @@
+ CORBA::SystemException
+ ));
+
+- IR::ModuleDef_ptr create_module (
+ 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
-+ ));
-+
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -30844,11 +30623,11 @@
+ CORBA::SystemException
+ ));
+
+- IR::ConstantDef_ptr create_constant (
+ IR_ConstantDef_ptr create_constant (
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -30857,11 +30636,11 @@
+ CORBA::SystemException
+ ));
+
+- IR::StructDef_ptr create_struct (
+ IR_StructDef_ptr create_struct (
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -30869,12 +30648,12 @@
+ CORBA::SystemException
+ ));
+
+- IR::UnionDef_ptr create_union (
+ IR_UnionDef_ptr create_union (
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -30882,11 +30661,11 @@
+ CORBA::SystemException
+ ));
+
+- IR::EnumDef_ptr create_enum (
+ IR_EnumDef_ptr create_enum (
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-+
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -30894,11 +30673,11 @@
+ CORBA::SystemException
+ ));
+
+- IR::AliasDef_ptr create_alias (
+ IR_AliasDef_ptr create_alias (
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -30906,11 +30685,11 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
+ IR_InterfaceDef_ptr create_interface (
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ 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 =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -30920,17 +30699,17 @@
+ CORBA::SystemException
+ ));
- 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 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,
++ 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
-- ));
-+ 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
-+ ));
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -30938,11 +30717,11 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
+ IR_ValueBoxDef_ptr create_value_box (
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -30950,11 +30729,11 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
+ IR_ExceptionDef_ptr create_exception (
-+ const char * id,
-+ const char * name,
-+ const char * version,
+ 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 ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -30962,7 +30741,7 @@
+ CORBA::SystemException
+ ));
- 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
-- ));
+ 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
-+ ));
-
-- char * id (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * id (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void id (
-- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void id (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void name (
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void name (
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * version (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void version (
-- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void version (
-+ const char * version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -31024,7 +30803,7 @@
+ CORBA::SystemException
+ ));
- IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+ IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ char * absolute_name (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -31040,7 +30819,7 @@
+ CORBA::SystemException
+ ));
- IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+ IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -31048,7 +30827,7 @@
+ CORBA::SystemException
+ ));
- IR::Contained::Description * describe (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+ IR_Contained::Description * describe (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void move (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -31057,7 +30836,7 @@
+ ));
+
+ void move (
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void move (
+ IR_Container_ptr new_container,
-+ const char * new_name,
-+ const char * new_version,
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- CORBA::TypeCode_ptr type (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ CORBA::TypeCode_ptr type (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -31075,7 +30854,7 @@
+ CORBA::SystemException
+ ));
- IR::DefinitionKind def_kind (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
+ IR_DefinitionKind def_kind (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
-- void destroy (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ));
-+ void destroy (
-+ CORBA::Environment &ACE_TRY_ENV =
-+ TAO_default_environment ()
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ));
-
- private:
-- T *ptr_;
-- PortableServer::POA_var poa_;
-- CORBA::Boolean rel_;
--
-- // copy and assignment are not allowed
-- HomeDef_tie (const HomeDef_tie &);
-- void operator= (const HomeDef_tie &);
--};
-+ T *ptr_;
-+ PortableServer::POA_var poa_;
-+ CORBA::Boolean rel_;
-+
-+ // copy and assignment are not allowed
-+ HomeDef_tie (const HomeDef_tie &);
-+ void operator= (const HomeDef_tie &);
-+ };
-
- #endif /* ACE_HAS_USING_KEYWORD */
-
-@@ -31121,4 +22312,4 @@
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -31121,4 +30900,4 @@
#endif /* __BORLANDC__ */
#include "ace/post.h"
diff --git a/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.i.diff b/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.i.diff
index 0738cc0bbcd..7ee8e14ce77 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.i.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.i.diff
@@ -1,6 +1,6 @@
---- InterfaceS.i Fri Jan 12 22:31:13 2001
-+++ ..\InterfaceS.i Wed Jan 10 20:36:35 2001
-@@ -1,119 +1,108 @@
+--- orig/InterfaceS.i Fri Mar 09 00:47:29 2001
++++ ../../orbsvcs/IFR_Service/InterfaceS.i Tue Jan 23 17:12:52 2001
+@@ -1,20 +1,9 @@
-// -*- C++ -*-
-//
-// $Id$
@@ -25,10 +25,8 @@
+// Distributed Object Computing at Washington University, St. Louis.
//
// Information about TAO is available at:
--// http://www.cs.wustl.edu/~schmidt/TAO.html
-+// http://www.cs.wustl.edu/~schmidt/TAO.html
-
- ACE_INLINE void POA_IR::Contained::_get_def_kind_skel (
+ // http://www.cs.wustl.edu/~schmidt/TAO.html
+@@ -23,97 +12,97 @@
TAO_ServerRequest &req,
void *obj,
void *context,
diff --git a/TAO/orbsvcs/IFR_Service/diffs/InterfaceS_T.i.diff b/TAO/orbsvcs/IFR_Service/diffs/InterfaceS_T.i.diff
index 853cb02caeb..2fed81b1ab6 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/InterfaceS_T.i.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/InterfaceS_T.i.diff
@@ -1,6 +1,6 @@
---- InterfaceS_T.i Fri Dec 01 16:26:23 2000
-+++ ..\..\..\orbsvcs\IFR_Service\InterfaceS_T.i Mon Nov 27 00:02:07 2000
-@@ -1,133 +1,16 @@
+--- orig/InterfaceS_T.i Fri Mar 09 00:47:29 2001
++++ ../../orbsvcs/IFR_Service/InterfaceS_T.i Fri Dec 01 19:24:14 2000
+@@ -1,20 +1,9 @@
-// -*- C++ -*-
-//
-// $Id$
@@ -25,9 +25,8 @@
+// Distributed Object Computing at Washington University, St. Louis.
//
// Information about TAO is available at:
--// http://www.cs.wustl.edu/~schmidt/TAO.html
-+// http://www.cs.wustl.edu/~schmidt/TAO.html
-
+ // http://www.cs.wustl.edu/~schmidt/TAO.html
+@@ -22,112 +11,6 @@
#if defined (ACE_HAS_USING_KEYWORD)
template <class T> ACE_INLINE
@@ -155,95 +154,7 @@
}
template <class T> ACE_INLINE
-@@ -213,7 +96,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -227,7 +110,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -241,7 +124,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -255,7 +138,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -269,7 +152,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -283,7 +166,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -297,7 +180,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -310,7 +193,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -323,7 +206,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -336,13 +219,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -342,7 +225,7 @@
template <class T> ACE_INLINE
void POA_IR::Contained_tie<T>::move (
@@ -252,33 +163,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -352,7 +235,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -368,7 +251,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -381,7 +264,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -457,12 +340,12 @@
}
@@ -294,15 +178,7 @@
}
template <class T> ACE_INLINE
-@@ -475,14 +358,14 @@
- ))
- {
- return this->ptr_->lookup (
--search_name,
-+ search_name,
- ACE_TRY_ENV
- );
- }
+@@ -482,7 +365,7 @@
template <class T> ACE_INLINE
IR::ContainedSeq * POA_IR::Container_tie<T>::contents (
@@ -311,15 +187,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -491,7 +374,7 @@
- ))
- {
- return this->ptr_->contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- ACE_TRY_ENV
- );
@@ -501,7 +384,7 @@
IR::ContainedSeq * POA_IR::Container_tie<T>::lookup_name (
const char * search_name,
@@ -329,15 +196,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -510,7 +393,7 @@
- ))
- {
- return this->ptr_->lookup_name (
--search_name,
-+ search_name,
- levels_to_search,
- limit_type,
- exclude_inherited,
@@ -520,7 +403,7 @@
template <class T> ACE_INLINE
@@ -347,24 +205,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Long max_returned_objs,
CORBA::Environment &ACE_TRY_ENV
-@@ -530,7 +413,7 @@
- ))
- {
- return this->ptr_->describe_contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- max_returned_objs,
- ACE_TRY_ENV
-@@ -549,7 +432,7 @@
- ))
- {
- return this->ptr_->create_module (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
@@ -561,7 +444,7 @@
const char * id,
const char * name,
@@ -374,15 +214,6 @@
const CORBA::Any & value,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -570,7 +453,7 @@
- ))
- {
- return this->ptr_->create_constant (
--id,
-+ id,
- name,
- version,
- type,
@@ -584,7 +467,7 @@
const char * id,
const char * name,
@@ -392,15 +223,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -592,7 +475,7 @@
- ))
- {
- return this->ptr_->create_struct (
--id,
-+ id,
- name,
- version,
- members,
@@ -605,8 +488,8 @@
const char * id,
const char * name,
@@ -412,15 +234,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -614,7 +497,7 @@
- ))
- {
- return this->ptr_->create_union (
--id,
-+ id,
- name,
- version,
- discriminator_type,
@@ -628,7 +511,7 @@
const char * id,
const char * name,
@@ -430,15 +243,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -636,7 +519,7 @@
- ))
- {
- return this->ptr_->create_enum (
--id,
-+ id,
- name,
- version,
- members,
@@ -649,7 +532,7 @@
const char * id,
const char * name,
@@ -448,15 +252,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -657,7 +540,7 @@
- ))
- {
- return this->ptr_->create_alias (
--id,
-+ id,
- name,
- version,
- original_type,
@@ -670,7 +553,7 @@
const char * id,
const char * name,
@@ -466,15 +261,6 @@
CORBA::Boolean is_abstract,
CORBA::Boolean is_local,
CORBA::Environment &ACE_TRY_ENV
-@@ -680,7 +563,7 @@
- ))
- {
- return this->ptr_->create_interface (
--id,
-+ id,
- name,
- version,
- base_interfaces,
@@ -697,11 +580,11 @@
const char * version,
CORBA::Boolean is_custom,
@@ -491,15 +277,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -709,7 +592,7 @@
- ))
- {
- return this->ptr_->create_value (
--id,
-+ id,
- name,
- version,
- is_custom,
@@ -728,7 +611,7 @@
const char * id,
const char * name,
@@ -509,15 +286,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -736,7 +619,7 @@
- ))
- {
- return this->ptr_->create_value_box (
--id,
-+ id,
- name,
- version,
- original_type_def,
@@ -749,7 +632,7 @@
const char * id,
const char * name,
@@ -527,42 +295,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -757,7 +640,7 @@
- ))
- {
- return this->ptr_->create_exception (
--id,
-+ id,
- name,
- version,
- members,
-@@ -777,7 +660,7 @@
- ))
- {
- return this->ptr_->create_native (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
-@@ -793,7 +676,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -806,7 +689,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -882,12 +765,12 @@
}
@@ -578,33 +310,6 @@
}
template <class T> ACE_INLINE
-@@ -899,7 +782,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -912,7 +795,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -925,7 +808,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -1001,12 +884,12 @@
}
@@ -620,24 +325,7 @@
}
template <class T> ACE_INLINE
-@@ -1019,7 +902,7 @@
- ))
- {
- return this->ptr_->lookup_id (
--search_id,
-+ search_id,
- ACE_TRY_ENV
- );
- }
-@@ -1034,14 +917,14 @@
- ))
- {
- return this->ptr_->get_canonical_typecode (
--tc,
-+ tc,
- ACE_TRY_ENV
- );
- }
+@@ -1041,7 +924,7 @@
template <class T> ACE_INLINE
IR::PrimitiveDef_ptr POA_IR::Repository_tie<T>::get_primitive (
@@ -646,33 +334,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -1049,7 +932,7 @@
- ))
- {
- return this->ptr_->get_primitive (
--kind,
-+ kind,
- ACE_TRY_ENV
- );
- }
-@@ -1064,7 +947,7 @@
- ))
- {
- return this->ptr_->create_string (
--bound,
-+ bound,
- ACE_TRY_ENV
- );
- }
-@@ -1079,7 +962,7 @@
- ))
- {
- return this->ptr_->create_wstring (
--bound,
-+ bound,
- ACE_TRY_ENV
- );
- }
@@ -1087,7 +970,7 @@
template <class T> ACE_INLINE
IR::SequenceDef_ptr POA_IR::Repository_tie<T>::create_sequence (
@@ -682,15 +343,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -1095,7 +978,7 @@
- ))
- {
- return this->ptr_->create_sequence (
--bound,
-+ bound,
- element_type,
- ACE_TRY_ENV
- );
@@ -1104,7 +987,7 @@
template <class T> ACE_INLINE
IR::ArrayDef_ptr POA_IR::Repository_tie<T>::create_array (
@@ -700,33 +352,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -1112,7 +995,7 @@
- ))
- {
- return this->ptr_->create_array (
--length,
-+ length,
- element_type,
- ACE_TRY_ENV
- );
-@@ -1129,7 +1012,7 @@
- ))
- {
- return this->ptr_->create_fixed (
--digits,
-+ digits,
- scale,
- ACE_TRY_ENV
- );
-@@ -1145,14 +1028,14 @@
- ))
- {
- return this->ptr_->lookup (
--search_name,
-+ search_name,
- ACE_TRY_ENV
- );
- }
+@@ -1152,7 +1035,7 @@
template <class T> ACE_INLINE
IR::ContainedSeq * POA_IR::Repository_tie<T>::contents (
@@ -735,15 +361,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -1161,7 +1044,7 @@
- ))
- {
- return this->ptr_->contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- ACE_TRY_ENV
- );
@@ -1171,7 +1054,7 @@
IR::ContainedSeq * POA_IR::Repository_tie<T>::lookup_name (
const char * search_name,
@@ -753,15 +370,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -1180,7 +1063,7 @@
- ))
- {
- return this->ptr_->lookup_name (
--search_name,
-+ search_name,
- levels_to_search,
- limit_type,
- exclude_inherited,
@@ -1190,7 +1073,7 @@
template <class T> ACE_INLINE
@@ -771,24 +379,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Long max_returned_objs,
CORBA::Environment &ACE_TRY_ENV
-@@ -1200,7 +1083,7 @@
- ))
- {
- return this->ptr_->describe_contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- max_returned_objs,
- ACE_TRY_ENV
-@@ -1219,7 +1102,7 @@
- ))
- {
- return this->ptr_->create_module (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
@@ -1231,7 +1114,7 @@
const char * id,
const char * name,
@@ -798,15 +388,6 @@
const CORBA::Any & value,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -1240,7 +1123,7 @@
- ))
- {
- return this->ptr_->create_constant (
--id,
-+ id,
- name,
- version,
- type,
@@ -1254,7 +1137,7 @@
const char * id,
const char * name,
@@ -816,15 +397,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -1262,7 +1145,7 @@
- ))
- {
- return this->ptr_->create_struct (
--id,
-+ id,
- name,
- version,
- members,
@@ -1275,8 +1158,8 @@
const char * id,
const char * name,
@@ -836,15 +408,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -1284,7 +1167,7 @@
- ))
- {
- return this->ptr_->create_union (
--id,
-+ id,
- name,
- version,
- discriminator_type,
@@ -1298,7 +1181,7 @@
const char * id,
const char * name,
@@ -854,15 +417,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -1306,7 +1189,7 @@
- ))
- {
- return this->ptr_->create_enum (
--id,
-+ id,
- name,
- version,
- members,
@@ -1319,7 +1202,7 @@
const char * id,
const char * name,
@@ -872,15 +426,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -1327,7 +1210,7 @@
- ))
- {
- return this->ptr_->create_alias (
--id,
-+ id,
- name,
- version,
- original_type,
@@ -1340,7 +1223,7 @@
const char * id,
const char * name,
@@ -890,15 +435,6 @@
CORBA::Boolean is_abstract,
CORBA::Boolean is_local,
CORBA::Environment &ACE_TRY_ENV
-@@ -1350,7 +1233,7 @@
- ))
- {
- return this->ptr_->create_interface (
--id,
-+ id,
- name,
- version,
- base_interfaces,
@@ -1367,11 +1250,11 @@
const char * version,
CORBA::Boolean is_custom,
@@ -915,15 +451,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -1379,7 +1262,7 @@
- ))
- {
- return this->ptr_->create_value (
--id,
-+ id,
- name,
- version,
- is_custom,
@@ -1398,7 +1281,7 @@
const char * id,
const char * name,
@@ -933,15 +460,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -1406,7 +1289,7 @@
- ))
- {
- return this->ptr_->create_value_box (
--id,
-+ id,
- name,
- version,
- original_type_def,
@@ -1419,7 +1302,7 @@
const char * id,
const char * name,
@@ -951,42 +469,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -1427,7 +1310,7 @@
- ))
- {
- return this->ptr_->create_exception (
--id,
-+ id,
- name,
- version,
- members,
-@@ -1447,7 +1330,7 @@
- ))
- {
- return this->ptr_->create_native (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
-@@ -1463,7 +1346,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -1476,7 +1359,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -1552,12 +1435,12 @@
}
@@ -1013,15 +495,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -1574,7 +1457,7 @@
- ))
- {
- return this->ptr_->create_component (
--id,
-+ id,
- name,
- version,
- base_component,
@@ -1588,9 +1471,9 @@
const char * id,
const char * name,
@@ -1035,33 +508,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -1598,7 +1481,7 @@
- ))
- {
- return this->ptr_->create_home (
--id,
-+ id,
- name,
- version,
- base_home,
-@@ -1618,7 +1501,7 @@
- ))
- {
- return this->ptr_->lookup_id (
--search_id,
-+ search_id,
- ACE_TRY_ENV
- );
- }
-@@ -1633,14 +1516,14 @@
- ))
- {
- return this->ptr_->get_canonical_typecode (
--tc,
-+ tc,
- ACE_TRY_ENV
- );
- }
+@@ -1640,7 +1523,7 @@
template <class T> ACE_INLINE
IR::PrimitiveDef_ptr POA_IR::ComponentRepository_tie<T>::get_primitive (
@@ -1070,33 +517,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -1648,7 +1531,7 @@
- ))
- {
- return this->ptr_->get_primitive (
--kind,
-+ kind,
- ACE_TRY_ENV
- );
- }
-@@ -1663,7 +1546,7 @@
- ))
- {
- return this->ptr_->create_string (
--bound,
-+ bound,
- ACE_TRY_ENV
- );
- }
-@@ -1678,7 +1561,7 @@
- ))
- {
- return this->ptr_->create_wstring (
--bound,
-+ bound,
- ACE_TRY_ENV
- );
- }
@@ -1686,7 +1569,7 @@
template <class T> ACE_INLINE
IR::SequenceDef_ptr POA_IR::ComponentRepository_tie<T>::create_sequence (
@@ -1106,15 +526,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -1694,7 +1577,7 @@
- ))
- {
- return this->ptr_->create_sequence (
--bound,
-+ bound,
- element_type,
- ACE_TRY_ENV
- );
@@ -1703,7 +1586,7 @@
template <class T> ACE_INLINE
IR::ArrayDef_ptr POA_IR::ComponentRepository_tie<T>::create_array (
@@ -1124,33 +535,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -1711,7 +1594,7 @@
- ))
- {
- return this->ptr_->create_array (
--length,
-+ length,
- element_type,
- ACE_TRY_ENV
- );
-@@ -1728,7 +1611,7 @@
- ))
- {
- return this->ptr_->create_fixed (
--digits,
-+ digits,
- scale,
- ACE_TRY_ENV
- );
-@@ -1744,14 +1627,14 @@
- ))
- {
- return this->ptr_->lookup (
--search_name,
-+ search_name,
- ACE_TRY_ENV
- );
- }
+@@ -1751,7 +1634,7 @@
template <class T> ACE_INLINE
IR::ContainedSeq * POA_IR::ComponentRepository_tie<T>::contents (
@@ -1159,15 +544,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -1760,7 +1643,7 @@
- ))
- {
- return this->ptr_->contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- ACE_TRY_ENV
- );
@@ -1770,7 +1653,7 @@
IR::ContainedSeq * POA_IR::ComponentRepository_tie<T>::lookup_name (
const char * search_name,
@@ -1177,15 +553,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -1779,7 +1662,7 @@
- ))
- {
- return this->ptr_->lookup_name (
--search_name,
-+ search_name,
- levels_to_search,
- limit_type,
- exclude_inherited,
@@ -1789,7 +1672,7 @@
template <class T> ACE_INLINE
@@ -1195,24 +562,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Long max_returned_objs,
CORBA::Environment &ACE_TRY_ENV
-@@ -1799,7 +1682,7 @@
- ))
- {
- return this->ptr_->describe_contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- max_returned_objs,
- ACE_TRY_ENV
-@@ -1818,7 +1701,7 @@
- ))
- {
- return this->ptr_->create_module (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
@@ -1830,7 +1713,7 @@
const char * id,
const char * name,
@@ -1222,15 +571,6 @@
const CORBA::Any & value,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -1839,7 +1722,7 @@
- ))
- {
- return this->ptr_->create_constant (
--id,
-+ id,
- name,
- version,
- type,
@@ -1853,7 +1736,7 @@
const char * id,
const char * name,
@@ -1240,15 +580,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -1861,7 +1744,7 @@
- ))
- {
- return this->ptr_->create_struct (
--id,
-+ id,
- name,
- version,
- members,
@@ -1874,8 +1757,8 @@
const char * id,
const char * name,
@@ -1260,15 +591,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -1883,7 +1766,7 @@
- ))
- {
- return this->ptr_->create_union (
--id,
-+ id,
- name,
- version,
- discriminator_type,
@@ -1897,7 +1780,7 @@
const char * id,
const char * name,
@@ -1278,15 +600,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -1905,7 +1788,7 @@
- ))
- {
- return this->ptr_->create_enum (
--id,
-+ id,
- name,
- version,
- members,
@@ -1918,7 +1801,7 @@
const char * id,
const char * name,
@@ -1296,15 +609,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -1926,7 +1809,7 @@
- ))
- {
- return this->ptr_->create_alias (
--id,
-+ id,
- name,
- version,
- original_type,
@@ -1939,7 +1822,7 @@
const char * id,
const char * name,
@@ -1314,15 +618,6 @@
CORBA::Boolean is_abstract,
CORBA::Boolean is_local,
CORBA::Environment &ACE_TRY_ENV
-@@ -1949,7 +1832,7 @@
- ))
- {
- return this->ptr_->create_interface (
--id,
-+ id,
- name,
- version,
- base_interfaces,
@@ -1966,11 +1849,11 @@
const char * version,
CORBA::Boolean is_custom,
@@ -1339,15 +634,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -1978,7 +1861,7 @@
- ))
- {
- return this->ptr_->create_value (
--id,
-+ id,
- name,
- version,
- is_custom,
@@ -1997,7 +1880,7 @@
const char * id,
const char * name,
@@ -1357,15 +643,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -2005,7 +1888,7 @@
- ))
- {
- return this->ptr_->create_value_box (
--id,
-+ id,
- name,
- version,
- original_type_def,
@@ -2018,7 +1901,7 @@
const char * id,
const char * name,
@@ -1375,42 +652,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -2026,7 +1909,7 @@
- ))
- {
- return this->ptr_->create_exception (
--id,
-+ id,
- name,
- version,
- members,
-@@ -2046,7 +1929,7 @@
- ))
- {
- return this->ptr_->create_native (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
-@@ -2062,7 +1945,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -2075,7 +1958,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -2151,12 +2034,12 @@
}
@@ -1426,15 +667,7 @@
}
template <class T> ACE_INLINE
-@@ -2169,14 +2052,14 @@
- ))
- {
- return this->ptr_->lookup (
--search_name,
-+ search_name,
- ACE_TRY_ENV
- );
- }
+@@ -2176,7 +2059,7 @@
template <class T> ACE_INLINE
IR::ContainedSeq * POA_IR::ModuleDef_tie<T>::contents (
@@ -1443,15 +676,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -2185,7 +2068,7 @@
- ))
- {
- return this->ptr_->contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- ACE_TRY_ENV
- );
@@ -2195,7 +2078,7 @@
IR::ContainedSeq * POA_IR::ModuleDef_tie<T>::lookup_name (
const char * search_name,
@@ -1461,15 +685,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -2204,7 +2087,7 @@
- ))
- {
- return this->ptr_->lookup_name (
--search_name,
-+ search_name,
- levels_to_search,
- limit_type,
- exclude_inherited,
@@ -2214,7 +2097,7 @@
template <class T> ACE_INLINE
@@ -1479,24 +694,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Long max_returned_objs,
CORBA::Environment &ACE_TRY_ENV
-@@ -2224,7 +2107,7 @@
- ))
- {
- return this->ptr_->describe_contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- max_returned_objs,
- ACE_TRY_ENV
-@@ -2243,7 +2126,7 @@
- ))
- {
- return this->ptr_->create_module (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
@@ -2255,7 +2138,7 @@
const char * id,
const char * name,
@@ -1506,15 +703,6 @@
const CORBA::Any & value,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -2264,7 +2147,7 @@
- ))
- {
- return this->ptr_->create_constant (
--id,
-+ id,
- name,
- version,
- type,
@@ -2278,7 +2161,7 @@
const char * id,
const char * name,
@@ -1524,15 +712,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -2286,7 +2169,7 @@
- ))
- {
- return this->ptr_->create_struct (
--id,
-+ id,
- name,
- version,
- members,
@@ -2299,8 +2182,8 @@
const char * id,
const char * name,
@@ -1544,15 +723,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -2308,7 +2191,7 @@
- ))
- {
- return this->ptr_->create_union (
--id,
-+ id,
- name,
- version,
- discriminator_type,
@@ -2322,7 +2205,7 @@
const char * id,
const char * name,
@@ -1562,15 +732,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -2330,7 +2213,7 @@
- ))
- {
- return this->ptr_->create_enum (
--id,
-+ id,
- name,
- version,
- members,
@@ -2343,7 +2226,7 @@
const char * id,
const char * name,
@@ -1580,15 +741,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -2351,7 +2234,7 @@
- ))
- {
- return this->ptr_->create_alias (
--id,
-+ id,
- name,
- version,
- original_type,
@@ -2364,7 +2247,7 @@
const char * id,
const char * name,
@@ -1598,15 +750,6 @@
CORBA::Boolean is_abstract,
CORBA::Boolean is_local,
CORBA::Environment &ACE_TRY_ENV
-@@ -2374,7 +2257,7 @@
- ))
- {
- return this->ptr_->create_interface (
--id,
-+ id,
- name,
- version,
- base_interfaces,
@@ -2391,11 +2274,11 @@
const char * version,
CORBA::Boolean is_custom,
@@ -1623,15 +766,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -2403,7 +2286,7 @@
- ))
- {
- return this->ptr_->create_value (
--id,
-+ id,
- name,
- version,
- is_custom,
@@ -2422,7 +2305,7 @@
const char * id,
const char * name,
@@ -1641,15 +775,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -2430,7 +2313,7 @@
- ))
- {
- return this->ptr_->create_value_box (
--id,
-+ id,
- name,
- version,
- original_type_def,
@@ -2443,7 +2326,7 @@
const char * id,
const char * name,
@@ -1659,113 +784,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -2451,7 +2334,7 @@
- ))
- {
- return this->ptr_->create_exception (
--id,
-+ id,
- name,
- version,
- members,
-@@ -2471,7 +2354,7 @@
- ))
- {
- return this->ptr_->create_native (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
-@@ -2487,7 +2370,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -2501,7 +2384,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -2515,7 +2398,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -2529,7 +2412,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -2543,7 +2426,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -2557,7 +2440,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -2571,7 +2454,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -2584,7 +2467,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -2597,7 +2480,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -2610,13 +2493,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -2616,7 +2499,7 @@
template <class T> ACE_INLINE
void POA_IR::ModuleDef_tie<T>::move (
@@ -1774,33 +793,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -2626,7 +2509,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -2642,7 +2525,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -2655,7 +2538,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -2731,12 +2614,12 @@
}
@@ -1816,23 +808,7 @@
}
template <class T> ACE_INLINE
-@@ -2748,7 +2631,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -2761,13 +2644,13 @@
- ))
- {
- return this->ptr_->type_def (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -2767,7 +2650,7 @@
template <class T> ACE_INLINE
void POA_IR::ConstantDef_tie<T>::type_def (
@@ -1841,122 +817,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -2775,7 +2658,7 @@
- ))
- {
- this->ptr_->type_def (
--type_def,
-+ type_def,
- ACE_TRY_ENV
- );
- }
-@@ -2789,7 +2672,7 @@
- ))
- {
- return this->ptr_->value (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -2803,7 +2686,7 @@
- ))
- {
- this->ptr_->value (
--value,
-+ value,
- ACE_TRY_ENV
- );
- }
-@@ -2817,7 +2700,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -2831,7 +2714,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -2845,7 +2728,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -2859,7 +2742,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -2873,7 +2756,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -2887,7 +2770,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -2901,7 +2784,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -2914,7 +2797,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -2927,7 +2810,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -2940,13 +2823,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -2946,7 +2829,7 @@
template <class T> ACE_INLINE
void POA_IR::ConstantDef_tie<T>::move (
@@ -1965,33 +826,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -2956,7 +2839,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -2972,7 +2855,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -2985,7 +2868,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -3061,12 +2944,12 @@
}
@@ -2007,95 +841,7 @@
}
template <class T> ACE_INLINE
-@@ -3078,7 +2961,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -3092,7 +2975,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -3106,7 +2989,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -3120,7 +3003,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -3134,7 +3017,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -3148,7 +3031,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -3162,7 +3045,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -3175,7 +3058,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -3188,7 +3071,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -3201,13 +3084,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -3207,7 +3090,7 @@
template <class T> ACE_INLINE
void POA_IR::TypedefDef_tie<T>::move (
@@ -2104,42 +850,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -3217,7 +3100,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -3233,7 +3116,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -3246,7 +3129,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -3259,7 +3142,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -3335,12 +3218,12 @@
}
@@ -2155,14 +865,7 @@
}
template <class T> ACE_INLINE
-@@ -3352,13 +3235,13 @@
- ))
- {
- return this->ptr_->members (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -3358,7 +3241,7 @@
template <class T> ACE_INLINE
void POA_IR::StructDef_tie<T>::members (
@@ -2171,24 +874,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -3366,7 +3249,7 @@
- ))
- {
- this->ptr_->members (
--members,
-+ members,
- ACE_TRY_ENV
- );
- }
-@@ -3381,14 +3264,14 @@
- ))
- {
- return this->ptr_->lookup (
--search_name,
-+ search_name,
- ACE_TRY_ENV
- );
- }
+@@ -3388,7 +3271,7 @@
template <class T> ACE_INLINE
IR::ContainedSeq * POA_IR::StructDef_tie<T>::contents (
@@ -2197,15 +883,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -3397,7 +3280,7 @@
- ))
- {
- return this->ptr_->contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- ACE_TRY_ENV
- );
@@ -3407,7 +3290,7 @@
IR::ContainedSeq * POA_IR::StructDef_tie<T>::lookup_name (
const char * search_name,
@@ -2215,15 +892,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -3416,7 +3299,7 @@
- ))
- {
- return this->ptr_->lookup_name (
--search_name,
-+ search_name,
- levels_to_search,
- limit_type,
- exclude_inherited,
@@ -3426,7 +3309,7 @@
template <class T> ACE_INLINE
@@ -2233,24 +901,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Long max_returned_objs,
CORBA::Environment &ACE_TRY_ENV
-@@ -3436,7 +3319,7 @@
- ))
- {
- return this->ptr_->describe_contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- max_returned_objs,
- ACE_TRY_ENV
-@@ -3455,7 +3338,7 @@
- ))
- {
- return this->ptr_->create_module (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
@@ -3467,7 +3350,7 @@
const char * id,
const char * name,
@@ -2260,15 +910,6 @@
const CORBA::Any & value,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -3476,7 +3359,7 @@
- ))
- {
- return this->ptr_->create_constant (
--id,
-+ id,
- name,
- version,
- type,
@@ -3490,7 +3373,7 @@
const char * id,
const char * name,
@@ -2278,15 +919,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -3498,7 +3381,7 @@
- ))
- {
- return this->ptr_->create_struct (
--id,
-+ id,
- name,
- version,
- members,
@@ -3511,8 +3394,8 @@
const char * id,
const char * name,
@@ -2298,15 +930,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -3520,7 +3403,7 @@
- ))
- {
- return this->ptr_->create_union (
--id,
-+ id,
- name,
- version,
- discriminator_type,
@@ -3534,7 +3417,7 @@
const char * id,
const char * name,
@@ -2316,15 +939,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -3542,7 +3425,7 @@
- ))
- {
- return this->ptr_->create_enum (
--id,
-+ id,
- name,
- version,
- members,
@@ -3555,7 +3438,7 @@
const char * id,
const char * name,
@@ -2334,15 +948,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -3563,7 +3446,7 @@
- ))
- {
- return this->ptr_->create_alias (
--id,
-+ id,
- name,
- version,
- original_type,
@@ -3576,7 +3459,7 @@
const char * id,
const char * name,
@@ -2352,15 +957,6 @@
CORBA::Boolean is_abstract,
CORBA::Boolean is_local,
CORBA::Environment &ACE_TRY_ENV
-@@ -3586,7 +3469,7 @@
- ))
- {
- return this->ptr_->create_interface (
--id,
-+ id,
- name,
- version,
- base_interfaces,
@@ -3603,11 +3486,11 @@
const char * version,
CORBA::Boolean is_custom,
@@ -2377,15 +973,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -3615,7 +3498,7 @@
- ))
- {
- return this->ptr_->create_value (
--id,
-+ id,
- name,
- version,
- is_custom,
@@ -3634,7 +3517,7 @@
const char * id,
const char * name,
@@ -2395,15 +982,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -3642,7 +3525,7 @@
- ))
- {
- return this->ptr_->create_value_box (
--id,
-+ id,
- name,
- version,
- original_type_def,
@@ -3655,7 +3538,7 @@
const char * id,
const char * name,
@@ -2413,113 +991,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -3663,7 +3546,7 @@
- ))
- {
- return this->ptr_->create_exception (
--id,
-+ id,
- name,
- version,
- members,
-@@ -3683,7 +3566,7 @@
- ))
- {
- return this->ptr_->create_native (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
-@@ -3699,7 +3582,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -3713,7 +3596,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -3727,7 +3610,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -3741,7 +3624,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -3755,7 +3638,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -3769,7 +3652,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -3783,7 +3666,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -3796,7 +3679,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -3809,7 +3692,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -3822,13 +3705,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -3828,7 +3711,7 @@
template <class T> ACE_INLINE
void POA_IR::StructDef_tie<T>::move (
@@ -2528,42 +1000,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -3838,7 +3721,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -3854,7 +3737,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -3867,7 +3750,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -3880,7 +3763,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -3956,12 +3839,12 @@
}
@@ -2579,23 +1015,7 @@
}
template <class T> ACE_INLINE
-@@ -3973,7 +3856,7 @@
- ))
- {
- return this->ptr_->discriminator_type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -3986,13 +3869,13 @@
- ))
- {
- return this->ptr_->discriminator_type_def (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -3992,7 +3875,7 @@
template <class T> ACE_INLINE
void POA_IR::UnionDef_tie<T>::discriminator_type_def (
@@ -2604,23 +1024,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -4000,7 +3883,7 @@
- ))
- {
- this->ptr_->discriminator_type_def (
--discriminator_type_def,
-+ discriminator_type_def,
- ACE_TRY_ENV
- );
- }
-@@ -4014,13 +3897,13 @@
- ))
- {
- return this->ptr_->members (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -4020,7 +3903,7 @@
template <class T> ACE_INLINE
void POA_IR::UnionDef_tie<T>::members (
@@ -2629,24 +1033,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -4028,7 +3911,7 @@
- ))
- {
- this->ptr_->members (
--members,
-+ members,
- ACE_TRY_ENV
- );
- }
-@@ -4043,14 +3926,14 @@
- ))
- {
- return this->ptr_->lookup (
--search_name,
-+ search_name,
- ACE_TRY_ENV
- );
- }
+@@ -4050,7 +3933,7 @@
template <class T> ACE_INLINE
IR::ContainedSeq * POA_IR::UnionDef_tie<T>::contents (
@@ -2655,15 +1042,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -4059,7 +3942,7 @@
- ))
- {
- return this->ptr_->contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- ACE_TRY_ENV
- );
@@ -4069,7 +3952,7 @@
IR::ContainedSeq * POA_IR::UnionDef_tie<T>::lookup_name (
const char * search_name,
@@ -2673,15 +1051,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -4078,7 +3961,7 @@
- ))
- {
- return this->ptr_->lookup_name (
--search_name,
-+ search_name,
- levels_to_search,
- limit_type,
- exclude_inherited,
@@ -4088,7 +3971,7 @@
template <class T> ACE_INLINE
@@ -2691,24 +1060,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Long max_returned_objs,
CORBA::Environment &ACE_TRY_ENV
-@@ -4098,7 +3981,7 @@
- ))
- {
- return this->ptr_->describe_contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- max_returned_objs,
- ACE_TRY_ENV
-@@ -4117,7 +4000,7 @@
- ))
- {
- return this->ptr_->create_module (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
@@ -4129,7 +4012,7 @@
const char * id,
const char * name,
@@ -2718,15 +1069,6 @@
const CORBA::Any & value,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -4138,7 +4021,7 @@
- ))
- {
- return this->ptr_->create_constant (
--id,
-+ id,
- name,
- version,
- type,
@@ -4152,7 +4035,7 @@
const char * id,
const char * name,
@@ -2736,15 +1078,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -4160,7 +4043,7 @@
- ))
- {
- return this->ptr_->create_struct (
--id,
-+ id,
- name,
- version,
- members,
@@ -4173,8 +4056,8 @@
const char * id,
const char * name,
@@ -2756,15 +1089,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -4182,7 +4065,7 @@
- ))
- {
- return this->ptr_->create_union (
--id,
-+ id,
- name,
- version,
- discriminator_type,
@@ -4196,7 +4079,7 @@
const char * id,
const char * name,
@@ -2774,15 +1098,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -4204,7 +4087,7 @@
- ))
- {
- return this->ptr_->create_enum (
--id,
-+ id,
- name,
- version,
- members,
@@ -4217,7 +4100,7 @@
const char * id,
const char * name,
@@ -2792,15 +1107,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -4225,7 +4108,7 @@
- ))
- {
- return this->ptr_->create_alias (
--id,
-+ id,
- name,
- version,
- original_type,
@@ -4238,7 +4121,7 @@
const char * id,
const char * name,
@@ -2810,15 +1116,6 @@
CORBA::Boolean is_abstract,
CORBA::Boolean is_local,
CORBA::Environment &ACE_TRY_ENV
-@@ -4248,7 +4131,7 @@
- ))
- {
- return this->ptr_->create_interface (
--id,
-+ id,
- name,
- version,
- base_interfaces,
@@ -4265,11 +4148,11 @@
const char * version,
CORBA::Boolean is_custom,
@@ -2835,15 +1132,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -4277,7 +4160,7 @@
- ))
- {
- return this->ptr_->create_value (
--id,
-+ id,
- name,
- version,
- is_custom,
@@ -4296,7 +4179,7 @@
const char * id,
const char * name,
@@ -2853,15 +1141,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -4304,7 +4187,7 @@
- ))
- {
- return this->ptr_->create_value_box (
--id,
-+ id,
- name,
- version,
- original_type_def,
@@ -4317,7 +4200,7 @@
const char * id,
const char * name,
@@ -2871,113 +1150,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -4325,7 +4208,7 @@
- ))
- {
- return this->ptr_->create_exception (
--id,
-+ id,
- name,
- version,
- members,
-@@ -4345,7 +4228,7 @@
- ))
- {
- return this->ptr_->create_native (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
-@@ -4361,7 +4244,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -4375,7 +4258,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -4389,7 +4272,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -4403,7 +4286,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -4417,7 +4300,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -4431,7 +4314,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -4445,7 +4328,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -4458,7 +4341,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -4471,7 +4354,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -4484,13 +4367,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -4490,7 +4373,7 @@
template <class T> ACE_INLINE
void POA_IR::UnionDef_tie<T>::move (
@@ -2986,42 +1159,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -4500,7 +4383,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -4516,7 +4399,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -4529,7 +4412,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -4542,7 +4425,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -4618,12 +4501,12 @@
}
@@ -3037,14 +1174,7 @@
}
template <class T> ACE_INLINE
-@@ -4635,13 +4518,13 @@
- ))
- {
- return this->ptr_->members (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -4641,7 +4524,7 @@
template <class T> ACE_INLINE
void POA_IR::EnumDef_tie<T>::members (
@@ -3053,104 +1183,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -4649,7 +4532,7 @@
- ))
- {
- this->ptr_->members (
--members,
-+ members,
- ACE_TRY_ENV
- );
- }
-@@ -4663,7 +4546,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -4677,7 +4560,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -4691,7 +4574,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -4705,7 +4588,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -4719,7 +4602,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -4733,7 +4616,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -4747,7 +4630,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -4760,7 +4643,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -4773,7 +4656,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -4786,13 +4669,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -4792,7 +4675,7 @@
template <class T> ACE_INLINE
void POA_IR::EnumDef_tie<T>::move (
@@ -3159,42 +1192,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -4802,7 +4685,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -4818,7 +4701,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -4831,7 +4714,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -4844,7 +4727,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -4920,12 +4803,12 @@
}
@@ -3210,14 +1207,7 @@
}
template <class T> ACE_INLINE
-@@ -4937,13 +4820,13 @@
- ))
- {
- return this->ptr_->original_type_def (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -4943,7 +4826,7 @@
template <class T> ACE_INLINE
void POA_IR::AliasDef_tie<T>::original_type_def (
@@ -3226,104 +1216,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -4951,7 +4834,7 @@
- ))
- {
- this->ptr_->original_type_def (
--original_type_def,
-+ original_type_def,
- ACE_TRY_ENV
- );
- }
-@@ -4965,7 +4848,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -4979,7 +4862,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -4993,7 +4876,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5007,7 +4890,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -5021,7 +4904,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5035,7 +4918,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -5049,7 +4932,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5062,7 +4945,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5075,7 +4958,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5088,13 +4971,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -5094,7 +4977,7 @@
template <class T> ACE_INLINE
void POA_IR::AliasDef_tie<T>::move (
@@ -3332,42 +1225,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -5104,7 +4987,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -5120,7 +5003,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5133,7 +5016,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5146,7 +5029,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -5222,12 +5105,12 @@
}
@@ -3383,95 +1240,7 @@
}
template <class T> ACE_INLINE
-@@ -5239,7 +5122,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5253,7 +5136,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -5267,7 +5150,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5281,7 +5164,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -5295,7 +5178,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5309,7 +5192,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -5323,7 +5206,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5336,7 +5219,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5349,7 +5232,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5362,13 +5245,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -5368,7 +5251,7 @@
template <class T> ACE_INLINE
void POA_IR::NativeDef_tie<T>::move (
@@ -3480,42 +1249,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -5378,7 +5261,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -5394,7 +5277,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5407,7 +5290,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5420,7 +5303,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -5496,12 +5379,12 @@
}
@@ -3531,42 +1264,6 @@
}
template <class T> ACE_INLINE
-@@ -5513,7 +5396,7 @@
- ))
- {
- return this->ptr_->kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5526,7 +5409,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5539,7 +5422,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5552,7 +5435,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -5628,12 +5511,12 @@
}
@@ -3582,51 +1279,6 @@
}
template <class T> ACE_INLINE
-@@ -5645,7 +5528,7 @@
- ))
- {
- return this->ptr_->bound (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5659,7 +5542,7 @@
- ))
- {
- this->ptr_->bound (
--bound,
-+ bound,
- ACE_TRY_ENV
- );
- }
-@@ -5673,7 +5556,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5686,7 +5569,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5699,7 +5582,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -5775,12 +5658,12 @@
}
@@ -3642,51 +1294,6 @@
}
template <class T> ACE_INLINE
-@@ -5792,7 +5675,7 @@
- ))
- {
- return this->ptr_->bound (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5806,7 +5689,7 @@
- ))
- {
- this->ptr_->bound (
--bound,
-+ bound,
- ACE_TRY_ENV
- );
- }
-@@ -5820,7 +5703,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5833,7 +5716,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5846,7 +5729,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -5922,12 +5805,12 @@
}
@@ -3702,69 +1309,6 @@
}
template <class T> ACE_INLINE
-@@ -5939,7 +5822,7 @@
- ))
- {
- return this->ptr_->digits (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5953,7 +5836,7 @@
- ))
- {
- this->ptr_->digits (
--digits,
-+ digits,
- ACE_TRY_ENV
- );
- }
-@@ -5967,7 +5850,7 @@
- ))
- {
- return this->ptr_->scale (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -5981,7 +5864,7 @@
- ))
- {
- this->ptr_->scale (
--scale,
-+ scale,
- ACE_TRY_ENV
- );
- }
-@@ -5995,7 +5878,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -6008,7 +5891,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -6021,7 +5904,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -6097,12 +5980,12 @@
}
@@ -3780,41 +1324,7 @@
}
template <class T> ACE_INLINE
-@@ -6114,7 +5997,7 @@
- ))
- {
- return this->ptr_->bound (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -6128,7 +6011,7 @@
- ))
- {
- this->ptr_->bound (
--bound,
-+ bound,
- ACE_TRY_ENV
- );
- }
-@@ -6142,7 +6025,7 @@
- ))
- {
- return this->ptr_->element_type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -6155,13 +6038,13 @@
- ))
- {
- return this->ptr_->element_type_def (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -6161,7 +6044,7 @@
template <class T> ACE_INLINE
void POA_IR::SequenceDef_tie<T>::element_type_def (
@@ -3823,42 +1333,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -6169,7 +6052,7 @@
- ))
- {
- this->ptr_->element_type_def (
--element_type_def,
-+ element_type_def,
- ACE_TRY_ENV
- );
- }
-@@ -6183,7 +6066,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -6196,7 +6079,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -6209,7 +6092,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -6285,12 +6168,12 @@
}
@@ -3874,41 +1348,7 @@
}
template <class T> ACE_INLINE
-@@ -6302,7 +6185,7 @@
- ))
- {
- return this->ptr_->length (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -6316,7 +6199,7 @@
- ))
- {
- this->ptr_->length (
--length,
-+ length,
- ACE_TRY_ENV
- );
- }
-@@ -6330,7 +6213,7 @@
- ))
- {
- return this->ptr_->element_type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -6343,13 +6226,13 @@
- ))
- {
- return this->ptr_->element_type_def (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -6349,7 +6232,7 @@
template <class T> ACE_INLINE
void POA_IR::ArrayDef_tie<T>::element_type_def (
@@ -3917,42 +1357,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -6357,7 +6240,7 @@
- ))
- {
- this->ptr_->element_type_def (
--element_type_def,
-+ element_type_def,
- ACE_TRY_ENV
- );
- }
-@@ -6371,7 +6254,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -6384,7 +6267,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -6397,7 +6280,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -6473,12 +6356,12 @@
}
@@ -3968,23 +1372,7 @@
}
template <class T> ACE_INLINE
-@@ -6490,7 +6373,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -6503,13 +6386,13 @@
- ))
- {
- return this->ptr_->members (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -6509,7 +6392,7 @@
template <class T> ACE_INLINE
void POA_IR::ExceptionDef_tie<T>::members (
@@ -3993,104 +1381,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -6517,7 +6400,7 @@
- ))
- {
- this->ptr_->members (
--members,
-+ members,
- ACE_TRY_ENV
- );
- }
-@@ -6531,7 +6414,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -6545,7 +6428,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -6559,7 +6442,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -6573,7 +6456,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -6587,7 +6470,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -6601,7 +6484,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -6615,7 +6498,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -6628,7 +6511,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -6641,7 +6524,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -6654,13 +6537,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -6660,7 +6543,7 @@
template <class T> ACE_INLINE
void POA_IR::ExceptionDef_tie<T>::move (
@@ -4099,24 +1390,7 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -6670,7 +6553,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -6687,14 +6570,14 @@
- ))
- {
- return this->ptr_->lookup (
--search_name,
-+ search_name,
- ACE_TRY_ENV
- );
- }
+@@ -6694,7 +6577,7 @@
template <class T> ACE_INLINE
IR::ContainedSeq * POA_IR::ExceptionDef_tie<T>::contents (
@@ -4125,15 +1399,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -6703,7 +6586,7 @@
- ))
- {
- return this->ptr_->contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- ACE_TRY_ENV
- );
@@ -6713,7 +6596,7 @@
IR::ContainedSeq * POA_IR::ExceptionDef_tie<T>::lookup_name (
const char * search_name,
@@ -4143,15 +1408,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -6722,7 +6605,7 @@
- ))
- {
- return this->ptr_->lookup_name (
--search_name,
-+ search_name,
- levels_to_search,
- limit_type,
- exclude_inherited,
@@ -6732,7 +6615,7 @@
template <class T> ACE_INLINE
@@ -4161,24 +1417,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Long max_returned_objs,
CORBA::Environment &ACE_TRY_ENV
-@@ -6742,7 +6625,7 @@
- ))
- {
- return this->ptr_->describe_contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- max_returned_objs,
- ACE_TRY_ENV
-@@ -6761,7 +6644,7 @@
- ))
- {
- return this->ptr_->create_module (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
@@ -6773,7 +6656,7 @@
const char * id,
const char * name,
@@ -4188,15 +1426,6 @@
const CORBA::Any & value,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -6782,7 +6665,7 @@
- ))
- {
- return this->ptr_->create_constant (
--id,
-+ id,
- name,
- version,
- type,
@@ -6796,7 +6679,7 @@
const char * id,
const char * name,
@@ -4206,15 +1435,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -6804,7 +6687,7 @@
- ))
- {
- return this->ptr_->create_struct (
--id,
-+ id,
- name,
- version,
- members,
@@ -6817,8 +6700,8 @@
const char * id,
const char * name,
@@ -4226,15 +1446,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -6826,7 +6709,7 @@
- ))
- {
- return this->ptr_->create_union (
--id,
-+ id,
- name,
- version,
- discriminator_type,
@@ -6840,7 +6723,7 @@
const char * id,
const char * name,
@@ -4244,15 +1455,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -6848,7 +6731,7 @@
- ))
- {
- return this->ptr_->create_enum (
--id,
-+ id,
- name,
- version,
- members,
@@ -6861,7 +6744,7 @@
const char * id,
const char * name,
@@ -4262,15 +1464,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -6869,7 +6752,7 @@
- ))
- {
- return this->ptr_->create_alias (
--id,
-+ id,
- name,
- version,
- original_type,
@@ -6882,7 +6765,7 @@
const char * id,
const char * name,
@@ -4280,15 +1473,6 @@
CORBA::Boolean is_abstract,
CORBA::Boolean is_local,
CORBA::Environment &ACE_TRY_ENV
-@@ -6892,7 +6775,7 @@
- ))
- {
- return this->ptr_->create_interface (
--id,
-+ id,
- name,
- version,
- base_interfaces,
@@ -6909,11 +6792,11 @@
const char * version,
CORBA::Boolean is_custom,
@@ -4305,15 +1489,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -6921,7 +6804,7 @@
- ))
- {
- return this->ptr_->create_value (
--id,
-+ id,
- name,
- version,
- is_custom,
@@ -6940,7 +6823,7 @@
const char * id,
const char * name,
@@ -4323,15 +1498,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -6948,7 +6831,7 @@
- ))
- {
- return this->ptr_->create_value_box (
--id,
-+ id,
- name,
- version,
- original_type_def,
@@ -6961,7 +6844,7 @@
const char * id,
const char * name,
@@ -4341,42 +1507,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -6969,7 +6852,7 @@
- ))
- {
- return this->ptr_->create_exception (
--id,
-+ id,
- name,
- version,
- members,
-@@ -6989,7 +6872,7 @@
- ))
- {
- return this->ptr_->create_native (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
-@@ -7005,7 +6888,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -7018,7 +6901,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -7094,12 +6977,12 @@
}
@@ -4392,23 +1522,7 @@
}
template <class T> ACE_INLINE
-@@ -7111,7 +6994,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -7124,13 +7007,13 @@
- ))
- {
- return this->ptr_->type_def (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -7130,7 +7013,7 @@
template <class T> ACE_INLINE
void POA_IR::AttributeDef_tie<T>::type_def (
@@ -4417,23 +1531,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -7138,7 +7021,7 @@
- ))
- {
- this->ptr_->type_def (
--type_def,
-+ type_def,
- ACE_TRY_ENV
- );
- }
-@@ -7152,13 +7035,13 @@
- ))
- {
- return this->ptr_->mode (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -7158,7 +7041,7 @@
template <class T> ACE_INLINE
void POA_IR::AttributeDef_tie<T>::mode (
@@ -4442,104 +1540,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -7166,7 +7049,7 @@
- ))
- {
- this->ptr_->mode (
--mode,
-+ mode,
- ACE_TRY_ENV
- );
- }
-@@ -7180,7 +7063,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -7194,7 +7077,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -7208,7 +7091,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -7222,7 +7105,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -7236,7 +7119,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -7250,7 +7133,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -7264,7 +7147,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -7277,7 +7160,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -7290,7 +7173,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -7303,13 +7186,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -7309,7 +7192,7 @@
template <class T> ACE_INLINE
void POA_IR::AttributeDef_tie<T>::move (
@@ -4548,33 +1549,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -7319,7 +7202,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -7335,7 +7218,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -7348,7 +7231,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -7424,12 +7307,12 @@
}
@@ -4590,23 +1564,7 @@
}
template <class T> ACE_INLINE
-@@ -7441,7 +7324,7 @@
- ))
- {
- return this->ptr_->result (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -7454,13 +7337,13 @@
- ))
- {
- return this->ptr_->result_def (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -7460,7 +7343,7 @@
template <class T> ACE_INLINE
void POA_IR::OperationDef_tie<T>::result_def (
@@ -4615,23 +1573,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -7468,7 +7351,7 @@
- ))
- {
- this->ptr_->result_def (
--result_def,
-+ result_def,
- ACE_TRY_ENV
- );
- }
-@@ -7482,13 +7365,13 @@
- ))
- {
- return this->ptr_->params (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -7488,7 +7371,7 @@
template <class T> ACE_INLINE
void POA_IR::OperationDef_tie<T>::params (
@@ -4640,23 +1582,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -7496,7 +7379,7 @@
- ))
- {
- this->ptr_->params (
--params,
-+ params,
- ACE_TRY_ENV
- );
- }
-@@ -7510,13 +7393,13 @@
- ))
- {
- return this->ptr_->mode (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -7516,7 +7399,7 @@
template <class T> ACE_INLINE
void POA_IR::OperationDef_tie<T>::mode (
@@ -4665,23 +1591,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -7524,7 +7407,7 @@
- ))
- {
- this->ptr_->mode (
--mode,
-+ mode,
- ACE_TRY_ENV
- );
- }
-@@ -7538,13 +7421,13 @@
- ))
- {
- return this->ptr_->contexts (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -7544,7 +7427,7 @@
template <class T> ACE_INLINE
void POA_IR::OperationDef_tie<T>::contexts (
@@ -4690,23 +1600,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -7552,7 +7435,7 @@
- ))
- {
- this->ptr_->contexts (
--contexts,
-+ contexts,
- ACE_TRY_ENV
- );
- }
-@@ -7566,13 +7449,13 @@
- ))
- {
- return this->ptr_->exceptions (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -7572,7 +7455,7 @@
template <class T> ACE_INLINE
void POA_IR::OperationDef_tie<T>::exceptions (
@@ -4715,104 +1609,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -7580,7 +7463,7 @@
- ))
- {
- this->ptr_->exceptions (
--exceptions,
-+ exceptions,
- ACE_TRY_ENV
- );
- }
-@@ -7594,7 +7477,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -7608,7 +7491,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -7622,7 +7505,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -7636,7 +7519,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -7650,7 +7533,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -7664,7 +7547,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -7678,7 +7561,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -7691,7 +7574,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -7704,7 +7587,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -7717,13 +7600,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -7723,7 +7606,7 @@
template <class T> ACE_INLINE
void POA_IR::OperationDef_tie<T>::move (
@@ -4821,33 +1618,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -7733,7 +7616,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -7749,7 +7632,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -7762,7 +7645,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -7838,12 +7721,12 @@
}
@@ -4863,14 +1633,7 @@
}
template <class T> ACE_INLINE
-@@ -7855,13 +7738,13 @@
- ))
- {
- return this->ptr_->base_interfaces (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -7861,7 +7744,7 @@
template <class T> ACE_INLINE
void POA_IR::InterfaceDef_tie<T>::base_interfaces (
@@ -4879,60 +1642,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -7869,7 +7752,7 @@
- ))
- {
- this->ptr_->base_interfaces (
--base_interfaces,
-+ base_interfaces,
- ACE_TRY_ENV
- );
- }
-@@ -7883,7 +7766,7 @@
- ))
- {
- return this->ptr_->is_abstract (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -7897,7 +7780,7 @@
- ))
- {
- this->ptr_->is_abstract (
--is_abstract,
-+ is_abstract,
- ACE_TRY_ENV
- );
- }
-@@ -7911,7 +7794,7 @@
- ))
- {
- return this->ptr_->is_local (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -7925,7 +7808,7 @@
- ))
- {
- this->ptr_->is_local (
--is_local,
-+ is_local,
- ACE_TRY_ENV
- );
- }
-@@ -7940,7 +7823,7 @@
- ))
- {
- return this->ptr_->is_a (
--interface_id,
-+ interface_id,
- ACE_TRY_ENV
- );
- }
@@ -7950,10 +7833,10 @@
const char * id,
const char * name,
@@ -4948,15 +1657,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -7961,7 +7844,7 @@
- ))
- {
- return this->ptr_->create_attribute (
--id,
-+ id,
- name,
- version,
- type,
@@ -7977,11 +7860,11 @@
const char * id,
const char * name,
@@ -4974,24 +1674,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -7989,7 +7872,7 @@
- ))
- {
- return this->ptr_->create_operation (
--id,
-+ id,
- name,
- version,
- result,
-@@ -8011,14 +7894,14 @@
- ))
- {
- return this->ptr_->lookup (
--search_name,
-+ search_name,
- ACE_TRY_ENV
- );
- }
+@@ -8018,7 +7901,7 @@
template <class T> ACE_INLINE
IR::ContainedSeq * POA_IR::InterfaceDef_tie<T>::contents (
@@ -5000,15 +1683,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -8027,7 +7910,7 @@
- ))
- {
- return this->ptr_->contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- ACE_TRY_ENV
- );
@@ -8037,7 +7920,7 @@
IR::ContainedSeq * POA_IR::InterfaceDef_tie<T>::lookup_name (
const char * search_name,
@@ -5018,15 +1692,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -8046,7 +7929,7 @@
- ))
- {
- return this->ptr_->lookup_name (
--search_name,
-+ search_name,
- levels_to_search,
- limit_type,
- exclude_inherited,
@@ -8056,7 +7939,7 @@
template <class T> ACE_INLINE
@@ -5036,24 +1701,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Long max_returned_objs,
CORBA::Environment &ACE_TRY_ENV
-@@ -8066,7 +7949,7 @@
- ))
- {
- return this->ptr_->describe_contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- max_returned_objs,
- ACE_TRY_ENV
-@@ -8085,7 +7968,7 @@
- ))
- {
- return this->ptr_->create_module (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
@@ -8097,7 +7980,7 @@
const char * id,
const char * name,
@@ -5063,15 +1710,6 @@
const CORBA::Any & value,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -8106,7 +7989,7 @@
- ))
- {
- return this->ptr_->create_constant (
--id,
-+ id,
- name,
- version,
- type,
@@ -8120,7 +8003,7 @@
const char * id,
const char * name,
@@ -5081,15 +1719,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -8128,7 +8011,7 @@
- ))
- {
- return this->ptr_->create_struct (
--id,
-+ id,
- name,
- version,
- members,
@@ -8141,8 +8024,8 @@
const char * id,
const char * name,
@@ -5101,15 +1730,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -8150,7 +8033,7 @@
- ))
- {
- return this->ptr_->create_union (
--id,
-+ id,
- name,
- version,
- discriminator_type,
@@ -8164,7 +8047,7 @@
const char * id,
const char * name,
@@ -5119,15 +1739,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -8172,7 +8055,7 @@
- ))
- {
- return this->ptr_->create_enum (
--id,
-+ id,
- name,
- version,
- members,
@@ -8185,7 +8068,7 @@
const char * id,
const char * name,
@@ -5137,15 +1748,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -8193,7 +8076,7 @@
- ))
- {
- return this->ptr_->create_alias (
--id,
-+ id,
- name,
- version,
- original_type,
@@ -8206,7 +8089,7 @@
const char * id,
const char * name,
@@ -5155,15 +1757,6 @@
CORBA::Boolean is_abstract,
CORBA::Boolean is_local,
CORBA::Environment &ACE_TRY_ENV
-@@ -8216,7 +8099,7 @@
- ))
- {
- return this->ptr_->create_interface (
--id,
-+ id,
- name,
- version,
- base_interfaces,
@@ -8233,11 +8116,11 @@
const char * version,
CORBA::Boolean is_custom,
@@ -5180,15 +1773,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -8245,7 +8128,7 @@
- ))
- {
- return this->ptr_->create_value (
--id,
-+ id,
- name,
- version,
- is_custom,
@@ -8264,7 +8147,7 @@
const char * id,
const char * name,
@@ -5198,15 +1782,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -8272,7 +8155,7 @@
- ))
- {
- return this->ptr_->create_value_box (
--id,
-+ id,
- name,
- version,
- original_type_def,
@@ -8285,7 +8168,7 @@
const char * id,
const char * name,
@@ -5216,113 +1791,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -8293,7 +8176,7 @@
- ))
- {
- return this->ptr_->create_exception (
--id,
-+ id,
- name,
- version,
- members,
-@@ -8313,7 +8196,7 @@
- ))
- {
- return this->ptr_->create_native (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
-@@ -8329,7 +8212,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -8343,7 +8226,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -8357,7 +8240,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -8371,7 +8254,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -8385,7 +8268,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -8399,7 +8282,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -8413,7 +8296,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -8426,7 +8309,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -8439,7 +8322,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -8452,13 +8335,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -8458,7 +8341,7 @@
template <class T> ACE_INLINE
void POA_IR::InterfaceDef_tie<T>::move (
@@ -5331,42 +1800,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -8468,7 +8351,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -8484,7 +8367,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -8497,7 +8380,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -8510,7 +8393,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -8586,12 +8469,12 @@
}
@@ -5382,23 +1815,7 @@
}
template <class T> ACE_INLINE
-@@ -8603,7 +8486,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -8616,13 +8499,13 @@
- ))
- {
- return this->ptr_->type_def (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -8622,7 +8505,7 @@
template <class T> ACE_INLINE
void POA_IR::ValueMemberDef_tie<T>::type_def (
@@ -5407,122 +1824,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -8630,7 +8513,7 @@
- ))
- {
- this->ptr_->type_def (
--type_def,
-+ type_def,
- ACE_TRY_ENV
- );
- }
-@@ -8644,7 +8527,7 @@
- ))
- {
- return this->ptr_->access (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -8658,7 +8541,7 @@
- ))
- {
- this->ptr_->access (
--access,
-+ access,
- ACE_TRY_ENV
- );
- }
-@@ -8672,7 +8555,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -8686,7 +8569,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -8700,7 +8583,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -8714,7 +8597,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -8728,7 +8611,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -8742,7 +8625,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -8756,7 +8639,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -8769,7 +8652,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -8782,7 +8665,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -8795,13 +8678,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -8801,7 +8684,7 @@
template <class T> ACE_INLINE
void POA_IR::ValueMemberDef_tie<T>::move (
@@ -5531,33 +1833,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -8811,7 +8694,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -8827,7 +8710,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -8840,7 +8723,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -8916,12 +8799,12 @@
}
@@ -5573,14 +1848,7 @@
}
template <class T> ACE_INLINE
-@@ -8933,13 +8816,13 @@
- ))
- {
- return this->ptr_->supported_interfaces (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -8939,7 +8822,7 @@
template <class T> ACE_INLINE
void POA_IR::ValueDef_tie<T>::supported_interfaces (
@@ -5589,23 +1857,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -8947,7 +8830,7 @@
- ))
- {
- this->ptr_->supported_interfaces (
--supported_interfaces,
-+ supported_interfaces,
- ACE_TRY_ENV
- );
- }
-@@ -8961,13 +8844,13 @@
- ))
- {
- return this->ptr_->initializers (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -8967,7 +8850,7 @@
template <class T> ACE_INLINE
void POA_IR::ValueDef_tie<T>::initializers (
@@ -5614,23 +1866,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -8975,7 +8858,7 @@
- ))
- {
- this->ptr_->initializers (
--initializers,
-+ initializers,
- ACE_TRY_ENV
- );
- }
-@@ -8989,13 +8872,13 @@
- ))
- {
- return this->ptr_->base_value (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -8995,7 +8878,7 @@
template <class T> ACE_INLINE
void POA_IR::ValueDef_tie<T>::base_value (
@@ -5639,23 +1875,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -9003,7 +8886,7 @@
- ))
- {
- this->ptr_->base_value (
--base_value,
-+ base_value,
- ACE_TRY_ENV
- );
- }
-@@ -9017,13 +8900,13 @@
- ))
- {
- return this->ptr_->abstract_base_values (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -9023,7 +8906,7 @@
template <class T> ACE_INLINE
void POA_IR::ValueDef_tie<T>::abstract_base_values (
@@ -5664,78 +1884,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -9031,7 +8914,7 @@
- ))
- {
- this->ptr_->abstract_base_values (
--abstract_base_values,
-+ abstract_base_values,
- ACE_TRY_ENV
- );
- }
-@@ -9045,7 +8928,7 @@
- ))
- {
- return this->ptr_->is_abstract (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -9059,7 +8942,7 @@
- ))
- {
- this->ptr_->is_abstract (
--is_abstract,
-+ is_abstract,
- ACE_TRY_ENV
- );
- }
-@@ -9073,7 +8956,7 @@
- ))
- {
- return this->ptr_->is_custom (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -9087,7 +8970,7 @@
- ))
- {
- this->ptr_->is_custom (
--is_custom,
-+ is_custom,
- ACE_TRY_ENV
- );
- }
-@@ -9101,7 +8984,7 @@
- ))
- {
- return this->ptr_->is_truncatable (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -9115,7 +8998,7 @@
- ))
- {
- this->ptr_->is_truncatable (
--is_truncatable,
-+ is_truncatable,
- ACE_TRY_ENV
- );
- }
-@@ -9130,7 +9013,7 @@
- ))
- {
- return this->ptr_->is_a (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
@@ -9140,7 +9023,7 @@
const char * id,
const char * name,
@@ -5745,15 +1893,6 @@
CORBA::Visibility access,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -9149,7 +9032,7 @@
- ))
- {
- return this->ptr_->create_value_member (
--id,
-+ id,
- name,
- version,
- type,
@@ -9163,10 +9046,10 @@
const char * id,
const char * name,
@@ -5769,15 +1908,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -9174,7 +9057,7 @@
- ))
- {
- return this->ptr_->create_attribute (
--id,
-+ id,
- name,
- version,
- type,
@@ -9190,11 +9073,11 @@
const char * id,
const char * name,
@@ -5795,24 +1925,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -9202,7 +9085,7 @@
- ))
- {
- return this->ptr_->create_operation (
--id,
-+ id,
- name,
- version,
- result,
-@@ -9224,14 +9107,14 @@
- ))
- {
- return this->ptr_->lookup (
--search_name,
-+ search_name,
- ACE_TRY_ENV
- );
- }
+@@ -9231,7 +9114,7 @@
template <class T> ACE_INLINE
IR::ContainedSeq * POA_IR::ValueDef_tie<T>::contents (
@@ -5821,15 +1934,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -9240,7 +9123,7 @@
- ))
- {
- return this->ptr_->contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- ACE_TRY_ENV
- );
@@ -9250,7 +9133,7 @@
IR::ContainedSeq * POA_IR::ValueDef_tie<T>::lookup_name (
const char * search_name,
@@ -5839,15 +1943,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -9259,7 +9142,7 @@
- ))
- {
- return this->ptr_->lookup_name (
--search_name,
-+ search_name,
- levels_to_search,
- limit_type,
- exclude_inherited,
@@ -9269,7 +9152,7 @@
template <class T> ACE_INLINE
@@ -5857,24 +1952,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Long max_returned_objs,
CORBA::Environment &ACE_TRY_ENV
-@@ -9279,7 +9162,7 @@
- ))
- {
- return this->ptr_->describe_contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- max_returned_objs,
- ACE_TRY_ENV
-@@ -9298,7 +9181,7 @@
- ))
- {
- return this->ptr_->create_module (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
@@ -9310,7 +9193,7 @@
const char * id,
const char * name,
@@ -5884,15 +1961,6 @@
const CORBA::Any & value,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -9319,7 +9202,7 @@
- ))
- {
- return this->ptr_->create_constant (
--id,
-+ id,
- name,
- version,
- type,
@@ -9333,7 +9216,7 @@
const char * id,
const char * name,
@@ -5902,15 +1970,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -9341,7 +9224,7 @@
- ))
- {
- return this->ptr_->create_struct (
--id,
-+ id,
- name,
- version,
- members,
@@ -9354,8 +9237,8 @@
const char * id,
const char * name,
@@ -5922,15 +1981,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -9363,7 +9246,7 @@
- ))
- {
- return this->ptr_->create_union (
--id,
-+ id,
- name,
- version,
- discriminator_type,
@@ -9377,7 +9260,7 @@
const char * id,
const char * name,
@@ -5940,15 +1990,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -9385,7 +9268,7 @@
- ))
- {
- return this->ptr_->create_enum (
--id,
-+ id,
- name,
- version,
- members,
@@ -9398,7 +9281,7 @@
const char * id,
const char * name,
@@ -5958,15 +1999,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -9406,7 +9289,7 @@
- ))
- {
- return this->ptr_->create_alias (
--id,
-+ id,
- name,
- version,
- original_type,
@@ -9419,7 +9302,7 @@
const char * id,
const char * name,
@@ -5976,15 +2008,6 @@
CORBA::Boolean is_abstract,
CORBA::Boolean is_local,
CORBA::Environment &ACE_TRY_ENV
-@@ -9429,7 +9312,7 @@
- ))
- {
- return this->ptr_->create_interface (
--id,
-+ id,
- name,
- version,
- base_interfaces,
@@ -9446,11 +9329,11 @@
const char * version,
CORBA::Boolean is_custom,
@@ -6001,15 +2024,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -9458,7 +9341,7 @@
- ))
- {
- return this->ptr_->create_value (
--id,
-+ id,
- name,
- version,
- is_custom,
@@ -9477,7 +9360,7 @@
const char * id,
const char * name,
@@ -6019,15 +2033,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -9485,7 +9368,7 @@
- ))
- {
- return this->ptr_->create_value_box (
--id,
-+ id,
- name,
- version,
- original_type_def,
@@ -9498,7 +9381,7 @@
const char * id,
const char * name,
@@ -6037,113 +2042,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -9506,7 +9389,7 @@
- ))
- {
- return this->ptr_->create_exception (
--id,
-+ id,
- name,
- version,
- members,
-@@ -9526,7 +9409,7 @@
- ))
- {
- return this->ptr_->create_native (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
-@@ -9542,7 +9425,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -9556,7 +9439,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -9570,7 +9453,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -9584,7 +9467,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -9598,7 +9481,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -9612,7 +9495,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -9626,7 +9509,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -9639,7 +9522,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -9652,7 +9535,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -9665,13 +9548,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -9671,7 +9554,7 @@
template <class T> ACE_INLINE
void POA_IR::ValueDef_tie<T>::move (
@@ -6152,42 +2051,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -9681,7 +9564,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -9697,7 +9580,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -9710,7 +9593,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -9723,7 +9606,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -9799,12 +9682,12 @@
}
@@ -6203,14 +2066,7 @@
}
template <class T> ACE_INLINE
-@@ -9816,13 +9699,13 @@
- ))
- {
- return this->ptr_->original_type_def (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -9822,7 +9705,7 @@
template <class T> ACE_INLINE
void POA_IR::ValueBoxDef_tie<T>::original_type_def (
@@ -6219,104 +2075,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -9830,7 +9713,7 @@
- ))
- {
- this->ptr_->original_type_def (
--original_type_def,
-+ original_type_def,
- ACE_TRY_ENV
- );
- }
-@@ -9844,7 +9727,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -9858,7 +9741,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -9872,7 +9755,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -9886,7 +9769,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -9900,7 +9783,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -9914,7 +9797,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -9928,7 +9811,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -9941,7 +9824,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -9954,7 +9837,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -9967,13 +9850,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -9973,7 +9856,7 @@
template <class T> ACE_INLINE
void POA_IR::ValueBoxDef_tie<T>::move (
@@ -6325,42 +2084,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -9983,7 +9866,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -9999,7 +9882,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10012,7 +9895,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10025,7 +9908,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -10101,12 +9984,12 @@
}
@@ -6376,104 +2099,7 @@
}
template <class T> ACE_INLINE
-@@ -10118,7 +10001,7 @@
- ))
- {
- return this->ptr_->interface_type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10131,7 +10014,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10145,7 +10028,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -10159,7 +10042,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10173,7 +10056,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -10187,7 +10070,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10201,7 +10084,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -10215,7 +10098,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10228,7 +10111,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10241,7 +10124,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10254,13 +10137,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -10260,7 +10143,7 @@
template <class T> ACE_INLINE
void POA_IR::ProvidesDef_tie<T>::move (
@@ -6482,33 +2108,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -10270,7 +10153,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -10286,7 +10169,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10299,7 +10182,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -10375,12 +10258,12 @@
}
@@ -6524,113 +2123,7 @@
}
template <class T> ACE_INLINE
-@@ -10392,7 +10275,7 @@
- ))
- {
- return this->ptr_->interface_type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10405,7 +10288,7 @@
- ))
- {
- return this->ptr_->is_multiple (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10418,7 +10301,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10432,7 +10315,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -10446,7 +10329,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10460,7 +10343,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -10474,7 +10357,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10488,7 +10371,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -10502,7 +10385,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10515,7 +10398,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10528,7 +10411,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10541,13 +10424,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -10547,7 +10430,7 @@
template <class T> ACE_INLINE
void POA_IR::UsesDef_tie<T>::move (
@@ -6639,33 +2132,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -10557,7 +10440,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -10573,7 +10456,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10586,7 +10469,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -10662,12 +10545,12 @@
}
@@ -6681,113 +2147,7 @@
}
template <class T> ACE_INLINE
-@@ -10680,7 +10563,7 @@
- ))
- {
- return this->ptr_->is_a (
--event_id,
-+ event_id,
- ACE_TRY_ENV
- );
- }
-@@ -10694,7 +10577,7 @@
- ))
- {
- return this->ptr_->event (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10707,7 +10590,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10721,7 +10604,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -10735,7 +10618,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10749,7 +10632,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -10763,7 +10646,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10777,7 +10660,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -10791,7 +10674,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10804,7 +10687,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10817,7 +10700,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10830,13 +10713,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -10836,7 +10719,7 @@
template <class T> ACE_INLINE
void POA_IR::EventDef_tie<T>::move (
@@ -6796,33 +2156,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -10846,7 +10729,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -10862,7 +10745,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10875,7 +10758,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -10951,12 +10834,12 @@
}
@@ -6838,113 +2171,7 @@
}
template <class T> ACE_INLINE
-@@ -10969,7 +10852,7 @@
- ))
- {
- return this->ptr_->is_a (
--event_id,
-+ event_id,
- ACE_TRY_ENV
- );
- }
-@@ -10983,7 +10866,7 @@
- ))
- {
- return this->ptr_->event (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -10996,7 +10879,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11010,7 +10893,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -11024,7 +10907,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11038,7 +10921,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -11052,7 +10935,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11066,7 +10949,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -11080,7 +10963,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11093,7 +10976,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11106,7 +10989,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11119,13 +11002,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -11125,7 +11008,7 @@
template <class T> ACE_INLINE
void POA_IR::EmitsDef_tie<T>::move (
@@ -6953,33 +2180,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -11135,7 +11018,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -11151,7 +11034,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11164,7 +11047,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -11240,12 +11123,12 @@
}
@@ -6995,113 +2195,7 @@
}
template <class T> ACE_INLINE
-@@ -11258,7 +11141,7 @@
- ))
- {
- return this->ptr_->is_a (
--event_id,
-+ event_id,
- ACE_TRY_ENV
- );
- }
-@@ -11272,7 +11155,7 @@
- ))
- {
- return this->ptr_->event (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11285,7 +11168,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11299,7 +11182,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -11313,7 +11196,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11327,7 +11210,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -11341,7 +11224,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11355,7 +11238,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -11369,7 +11252,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11382,7 +11265,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11395,7 +11278,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11408,13 +11291,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -11414,7 +11297,7 @@
template <class T> ACE_INLINE
void POA_IR::PublishesDef_tie<T>::move (
@@ -7110,33 +2204,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -11424,7 +11307,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -11440,7 +11323,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11453,7 +11336,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -11529,12 +11412,12 @@
}
@@ -7152,113 +2219,7 @@
}
template <class T> ACE_INLINE
-@@ -11547,7 +11430,7 @@
- ))
- {
- return this->ptr_->is_a (
--event_id,
-+ event_id,
- ACE_TRY_ENV
- );
- }
-@@ -11561,7 +11444,7 @@
- ))
- {
- return this->ptr_->event (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11574,7 +11457,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11588,7 +11471,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -11602,7 +11485,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11616,7 +11499,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -11630,7 +11513,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11644,7 +11527,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -11658,7 +11541,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11671,7 +11554,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11684,7 +11567,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11697,13 +11580,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -11703,7 +11586,7 @@
template <class T> ACE_INLINE
void POA_IR::ConsumesDef_tie<T>::move (
@@ -7267,33 +2228,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -11713,7 +11596,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -11729,7 +11612,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11742,7 +11625,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -11818,12 +11701,12 @@
}
@@ -7309,14 +2243,7 @@
}
template <class T> ACE_INLINE
-@@ -11835,13 +11718,13 @@
- ))
- {
- return this->ptr_->supported_interfaces (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -11841,7 +11724,7 @@
template <class T> ACE_INLINE
void POA_IR::ComponentDef_tie<T>::supported_interfaces (
@@ -7325,78 +2252,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -11849,7 +11732,7 @@
- ))
- {
- this->ptr_->supported_interfaces (
--supported_interfaces,
-+ supported_interfaces,
- ACE_TRY_ENV
- );
- }
-@@ -11863,7 +11746,7 @@
- ))
- {
- return this->ptr_->base_component (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11876,7 +11759,7 @@
- ))
- {
- return this->ptr_->provides_interfaces (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11889,7 +11772,7 @@
- ))
- {
- return this->ptr_->uses_interfaces (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11902,7 +11785,7 @@
- ))
- {
- return this->ptr_->emits_events (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11915,7 +11798,7 @@
- ))
- {
- return this->ptr_->publishes_events (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11928,7 +11811,7 @@
- ))
- {
- return this->ptr_->consumes_events (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -11941,7 +11824,7 @@
- ))
- {
- return this->ptr_->is_basic (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -11950,7 +11833,7 @@
const char * id,
const char * name,
@@ -7406,15 +2261,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -11958,7 +11841,7 @@
- ))
- {
- return this->ptr_->create_provides (
--id,
-+ id,
- name,
- version,
- interface_type,
@@ -11971,7 +11854,7 @@
const char * id,
const char * name,
@@ -7424,15 +2270,6 @@
CORBA::Boolean is_multiple,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -11980,7 +11863,7 @@
- ))
- {
- return this->ptr_->create_uses (
--id,
-+ id,
- name,
- version,
- interface_type,
@@ -11994,7 +11877,7 @@
const char * id,
const char * name,
@@ -7442,15 +2279,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -12002,7 +11885,7 @@
- ))
- {
- return this->ptr_->create_emits (
--id,
-+ id,
- name,
- version,
- value,
@@ -12015,7 +11898,7 @@
const char * id,
const char * name,
@@ -7460,15 +2288,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -12023,7 +11906,7 @@
- ))
- {
- return this->ptr_->create_publishes (
--id,
-+ id,
- name,
- version,
- value,
@@ -12036,7 +11919,7 @@
const char * id,
const char * name,
@@ -7478,23 +2297,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -12044,7 +11927,7 @@
- ))
- {
- return this->ptr_->create_consumes (
--id,
-+ id,
- name,
- version,
- value,
-@@ -12061,13 +11944,13 @@
- ))
- {
- return this->ptr_->base_interfaces (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -12067,7 +11950,7 @@
template <class T> ACE_INLINE
void POA_IR::ComponentDef_tie<T>::base_interfaces (
@@ -7503,60 +2306,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -12075,7 +11958,7 @@
- ))
- {
- this->ptr_->base_interfaces (
--base_interfaces,
-+ base_interfaces,
- ACE_TRY_ENV
- );
- }
-@@ -12089,7 +11972,7 @@
- ))
- {
- return this->ptr_->is_abstract (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -12103,7 +11986,7 @@
- ))
- {
- this->ptr_->is_abstract (
--is_abstract,
-+ is_abstract,
- ACE_TRY_ENV
- );
- }
-@@ -12117,7 +12000,7 @@
- ))
- {
- return this->ptr_->is_local (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -12131,7 +12014,7 @@
- ))
- {
- this->ptr_->is_local (
--is_local,
-+ is_local,
- ACE_TRY_ENV
- );
- }
-@@ -12146,7 +12029,7 @@
- ))
- {
- return this->ptr_->is_a (
--interface_id,
-+ interface_id,
- ACE_TRY_ENV
- );
- }
@@ -12156,10 +12039,10 @@
const char * id,
const char * name,
@@ -7572,15 +2321,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -12167,7 +12050,7 @@
- ))
- {
- return this->ptr_->create_attribute (
--id,
-+ id,
- name,
- version,
- type,
@@ -12183,11 +12066,11 @@
const char * id,
const char * name,
@@ -7598,24 +2338,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -12195,7 +12078,7 @@
- ))
- {
- return this->ptr_->create_operation (
--id,
-+ id,
- name,
- version,
- result,
-@@ -12217,14 +12100,14 @@
- ))
- {
- return this->ptr_->lookup (
--search_name,
-+ search_name,
- ACE_TRY_ENV
- );
- }
+@@ -12224,7 +12107,7 @@
template <class T> ACE_INLINE
IR::ContainedSeq * POA_IR::ComponentDef_tie<T>::contents (
@@ -7624,15 +2347,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -12233,7 +12116,7 @@
- ))
- {
- return this->ptr_->contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- ACE_TRY_ENV
- );
@@ -12243,7 +12126,7 @@
IR::ContainedSeq * POA_IR::ComponentDef_tie<T>::lookup_name (
const char * search_name,
@@ -7642,15 +2356,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -12252,7 +12135,7 @@
- ))
- {
- return this->ptr_->lookup_name (
--search_name,
-+ search_name,
- levels_to_search,
- limit_type,
- exclude_inherited,
@@ -12262,7 +12145,7 @@
template <class T> ACE_INLINE
@@ -7660,24 +2365,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Long max_returned_objs,
CORBA::Environment &ACE_TRY_ENV
-@@ -12272,7 +12155,7 @@
- ))
- {
- return this->ptr_->describe_contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- max_returned_objs,
- ACE_TRY_ENV
-@@ -12291,7 +12174,7 @@
- ))
- {
- return this->ptr_->create_module (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
@@ -12303,7 +12186,7 @@
const char * id,
const char * name,
@@ -7687,15 +2374,6 @@
const CORBA::Any & value,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -12312,7 +12195,7 @@
- ))
- {
- return this->ptr_->create_constant (
--id,
-+ id,
- name,
- version,
- type,
@@ -12326,7 +12209,7 @@
const char * id,
const char * name,
@@ -7705,15 +2383,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -12334,7 +12217,7 @@
- ))
- {
- return this->ptr_->create_struct (
--id,
-+ id,
- name,
- version,
- members,
@@ -12347,8 +12230,8 @@
const char * id,
const char * name,
@@ -7725,15 +2394,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -12356,7 +12239,7 @@
- ))
- {
- return this->ptr_->create_union (
--id,
-+ id,
- name,
- version,
- discriminator_type,
@@ -12370,7 +12253,7 @@
const char * id,
const char * name,
@@ -7743,15 +2403,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -12378,7 +12261,7 @@
- ))
- {
- return this->ptr_->create_enum (
--id,
-+ id,
- name,
- version,
- members,
@@ -12391,7 +12274,7 @@
const char * id,
const char * name,
@@ -7761,15 +2412,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -12399,7 +12282,7 @@
- ))
- {
- return this->ptr_->create_alias (
--id,
-+ id,
- name,
- version,
- original_type,
@@ -12412,7 +12295,7 @@
const char * id,
const char * name,
@@ -7779,15 +2421,6 @@
CORBA::Boolean is_abstract,
CORBA::Boolean is_local,
CORBA::Environment &ACE_TRY_ENV
-@@ -12422,7 +12305,7 @@
- ))
- {
- return this->ptr_->create_interface (
--id,
-+ id,
- name,
- version,
- base_interfaces,
@@ -12439,11 +12322,11 @@
const char * version,
CORBA::Boolean is_custom,
@@ -7804,15 +2437,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -12451,7 +12334,7 @@
- ))
- {
- return this->ptr_->create_value (
--id,
-+ id,
- name,
- version,
- is_custom,
@@ -12470,7 +12353,7 @@
const char * id,
const char * name,
@@ -7822,15 +2446,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -12478,7 +12361,7 @@
- ))
- {
- return this->ptr_->create_value_box (
--id,
-+ id,
- name,
- version,
- original_type_def,
@@ -12491,7 +12374,7 @@
const char * id,
const char * name,
@@ -7840,113 +2455,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -12499,7 +12382,7 @@
- ))
- {
- return this->ptr_->create_exception (
--id,
-+ id,
- name,
- version,
- members,
-@@ -12519,7 +12402,7 @@
- ))
- {
- return this->ptr_->create_native (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
-@@ -12535,7 +12418,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -12549,7 +12432,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -12563,7 +12446,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -12577,7 +12460,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -12591,7 +12474,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -12605,7 +12488,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -12619,7 +12502,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -12632,7 +12515,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -12645,7 +12528,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -12658,13 +12541,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -12664,7 +12547,7 @@
template <class T> ACE_INLINE
void POA_IR::ComponentDef_tie<T>::move (
@@ -7955,42 +2464,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -12674,7 +12557,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -12690,7 +12573,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -12703,7 +12586,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -12716,7 +12599,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -12792,12 +12675,12 @@
}
@@ -8006,113 +2479,7 @@
}
template <class T> ACE_INLINE
-@@ -12810,7 +12693,7 @@
- ))
- {
- return this->ptr_->is_a (
--primary_key_id,
-+ primary_key_id,
- ACE_TRY_ENV
- );
- }
-@@ -12824,7 +12707,7 @@
- ))
- {
- return this->ptr_->primary_key (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -12837,7 +12720,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -12851,7 +12734,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -12865,7 +12748,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -12879,7 +12762,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -12893,7 +12776,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -12907,7 +12790,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -12921,7 +12804,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -12934,7 +12817,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -12947,7 +12830,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -12960,13 +12843,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -12966,7 +12849,7 @@
template <class T> ACE_INLINE
void POA_IR::PrimaryKeyDef_tie<T>::move (
@@ -8121,33 +2488,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -12976,7 +12859,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -12992,7 +12875,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13005,7 +12888,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -13081,12 +12964,12 @@
}
@@ -8163,23 +2503,7 @@
}
template <class T> ACE_INLINE
-@@ -13098,7 +12981,7 @@
- ))
- {
- return this->ptr_->result (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13111,13 +12994,13 @@
- ))
- {
- return this->ptr_->result_def (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -13117,7 +13000,7 @@
template <class T> ACE_INLINE
void POA_IR::FactoryDef_tie<T>::result_def (
@@ -8188,23 +2512,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -13125,7 +13008,7 @@
- ))
- {
- this->ptr_->result_def (
--result_def,
-+ result_def,
- ACE_TRY_ENV
- );
- }
-@@ -13139,13 +13022,13 @@
- ))
- {
- return this->ptr_->params (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -13145,7 +13028,7 @@
template <class T> ACE_INLINE
void POA_IR::FactoryDef_tie<T>::params (
@@ -8213,23 +2521,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -13153,7 +13036,7 @@
- ))
- {
- this->ptr_->params (
--params,
-+ params,
- ACE_TRY_ENV
- );
- }
-@@ -13167,13 +13050,13 @@
- ))
- {
- return this->ptr_->mode (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -13173,7 +13056,7 @@
template <class T> ACE_INLINE
void POA_IR::FactoryDef_tie<T>::mode (
@@ -8238,23 +2530,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -13181,7 +13064,7 @@
- ))
- {
- this->ptr_->mode (
--mode,
-+ mode,
- ACE_TRY_ENV
- );
- }
-@@ -13195,13 +13078,13 @@
- ))
- {
- return this->ptr_->contexts (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -13201,7 +13084,7 @@
template <class T> ACE_INLINE
void POA_IR::FactoryDef_tie<T>::contexts (
@@ -8263,23 +2539,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -13209,7 +13092,7 @@
- ))
- {
- this->ptr_->contexts (
--contexts,
-+ contexts,
- ACE_TRY_ENV
- );
- }
-@@ -13223,13 +13106,13 @@
- ))
- {
- return this->ptr_->exceptions (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -13229,7 +13112,7 @@
template <class T> ACE_INLINE
void POA_IR::FactoryDef_tie<T>::exceptions (
@@ -8288,104 +2548,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -13237,7 +13120,7 @@
- ))
- {
- this->ptr_->exceptions (
--exceptions,
-+ exceptions,
- ACE_TRY_ENV
- );
- }
-@@ -13251,7 +13134,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13265,7 +13148,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -13279,7 +13162,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13293,7 +13176,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -13307,7 +13190,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13321,7 +13204,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -13335,7 +13218,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13348,7 +13231,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13361,7 +13244,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13374,13 +13257,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -13380,7 +13263,7 @@
template <class T> ACE_INLINE
void POA_IR::FactoryDef_tie<T>::move (
@@ -8394,33 +2557,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -13390,7 +13273,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -13406,7 +13289,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13419,7 +13302,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -13495,12 +13378,12 @@
}
@@ -8436,23 +2572,7 @@
}
template <class T> ACE_INLINE
-@@ -13512,7 +13395,7 @@
- ))
- {
- return this->ptr_->result (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13525,13 +13408,13 @@
- ))
- {
- return this->ptr_->result_def (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -13531,7 +13414,7 @@
template <class T> ACE_INLINE
void POA_IR::FinderDef_tie<T>::result_def (
@@ -8461,23 +2581,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -13539,7 +13422,7 @@
- ))
- {
- this->ptr_->result_def (
--result_def,
-+ result_def,
- ACE_TRY_ENV
- );
- }
-@@ -13553,13 +13436,13 @@
- ))
- {
- return this->ptr_->params (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -13559,7 +13442,7 @@
template <class T> ACE_INLINE
void POA_IR::FinderDef_tie<T>::params (
@@ -8486,23 +2590,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -13567,7 +13450,7 @@
- ))
- {
- this->ptr_->params (
--params,
-+ params,
- ACE_TRY_ENV
- );
- }
-@@ -13581,13 +13464,13 @@
- ))
- {
- return this->ptr_->mode (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -13587,7 +13470,7 @@
template <class T> ACE_INLINE
void POA_IR::FinderDef_tie<T>::mode (
@@ -8511,23 +2599,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -13595,7 +13478,7 @@
- ))
- {
- this->ptr_->mode (
--mode,
-+ mode,
- ACE_TRY_ENV
- );
- }
-@@ -13609,13 +13492,13 @@
- ))
- {
- return this->ptr_->contexts (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -13615,7 +13498,7 @@
template <class T> ACE_INLINE
void POA_IR::FinderDef_tie<T>::contexts (
@@ -8536,23 +2608,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -13623,7 +13506,7 @@
- ))
- {
- this->ptr_->contexts (
--contexts,
-+ contexts,
- ACE_TRY_ENV
- );
- }
-@@ -13637,13 +13520,13 @@
- ))
- {
- return this->ptr_->exceptions (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -13643,7 +13526,7 @@
template <class T> ACE_INLINE
void POA_IR::FinderDef_tie<T>::exceptions (
@@ -8561,104 +2617,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -13651,7 +13534,7 @@
- ))
- {
- this->ptr_->exceptions (
--exceptions,
-+ exceptions,
- ACE_TRY_ENV
- );
- }
-@@ -13665,7 +13548,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13679,7 +13562,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -13693,7 +13576,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13707,7 +13590,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -13721,7 +13604,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13735,7 +13618,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -13749,7 +13632,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13762,7 +13645,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13775,7 +13658,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13788,13 +13671,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -13794,7 +13677,7 @@
template <class T> ACE_INLINE
void POA_IR::FinderDef_tie<T>::move (
@@ -8667,33 +2626,6 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -13804,7 +13687,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -13820,7 +13703,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13833,7 +13716,7 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -13909,12 +13792,12 @@
}
@@ -8709,60 +2641,6 @@
}
template <class T> ACE_INLINE
-@@ -13926,7 +13809,7 @@
- ))
- {
- return this->ptr_->base_home (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13939,7 +13822,7 @@
- ))
- {
- return this->ptr_->managed_component (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13952,7 +13835,7 @@
- ))
- {
- return this->ptr_->primary_key (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13965,7 +13848,7 @@
- ))
- {
- return this->ptr_->factories (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13978,7 +13861,7 @@
- ))
- {
- return this->ptr_->finders (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -13991,7 +13874,7 @@
- ))
- {
- return this->ptr_->is_basic (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
@@ -14000,7 +13883,7 @@
const char * id,
const char * name,
@@ -8772,15 +2650,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -14008,7 +13891,7 @@
- ))
- {
- return this->ptr_->create_primary_key (
--id,
-+ id,
- name,
- version,
- primary_key,
@@ -14021,8 +13904,8 @@
const char * id,
const char * name,
@@ -8792,15 +2661,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -14030,7 +13913,7 @@
- ))
- {
- return this->ptr_->create_factory (
--id,
-+ id,
- name,
- version,
- params,
@@ -14044,8 +13927,8 @@
const char * id,
const char * name,
@@ -8812,23 +2672,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -14053,7 +13936,7 @@
- ))
- {
- return this->ptr_->create_finder (
--id,
-+ id,
- name,
- version,
- params,
-@@ -14071,13 +13954,13 @@
- ))
- {
- return this->ptr_->base_interfaces (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -14077,7 +13960,7 @@
template <class T> ACE_INLINE
void POA_IR::HomeDef_tie<T>::base_interfaces (
@@ -8837,60 +2681,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -14085,7 +13968,7 @@
- ))
- {
- this->ptr_->base_interfaces (
--base_interfaces,
-+ base_interfaces,
- ACE_TRY_ENV
- );
- }
-@@ -14099,7 +13982,7 @@
- ))
- {
- return this->ptr_->is_abstract (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -14113,7 +13996,7 @@
- ))
- {
- this->ptr_->is_abstract (
--is_abstract,
-+ is_abstract,
- ACE_TRY_ENV
- );
- }
-@@ -14127,7 +14010,7 @@
- ))
- {
- return this->ptr_->is_local (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -14141,7 +14024,7 @@
- ))
- {
- this->ptr_->is_local (
--is_local,
-+ is_local,
- ACE_TRY_ENV
- );
- }
-@@ -14156,7 +14039,7 @@
- ))
- {
- return this->ptr_->is_a (
--interface_id,
-+ interface_id,
- ACE_TRY_ENV
- );
- }
@@ -14166,10 +14049,10 @@
const char * id,
const char * name,
@@ -8906,15 +2696,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -14177,7 +14060,7 @@
- ))
- {
- return this->ptr_->create_attribute (
--id,
-+ id,
- name,
- version,
- type,
@@ -14193,11 +14076,11 @@
const char * id,
const char * name,
@@ -8932,24 +2713,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -14205,7 +14088,7 @@
- ))
- {
- return this->ptr_->create_operation (
--id,
-+ id,
- name,
- version,
- result,
-@@ -14227,14 +14110,14 @@
- ))
- {
- return this->ptr_->lookup (
--search_name,
-+ search_name,
- ACE_TRY_ENV
- );
- }
+@@ -14234,7 +14117,7 @@
template <class T> ACE_INLINE
IR::ContainedSeq * POA_IR::HomeDef_tie<T>::contents (
@@ -8958,15 +2722,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -14243,7 +14126,7 @@
- ))
- {
- return this->ptr_->contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- ACE_TRY_ENV
- );
@@ -14253,7 +14136,7 @@
IR::ContainedSeq * POA_IR::HomeDef_tie<T>::lookup_name (
const char * search_name,
@@ -8976,15 +2731,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -14262,7 +14145,7 @@
- ))
- {
- return this->ptr_->lookup_name (
--search_name,
-+ search_name,
- levels_to_search,
- limit_type,
- exclude_inherited,
@@ -14272,7 +14155,7 @@
template <class T> ACE_INLINE
@@ -8994,24 +2740,6 @@
CORBA::Boolean exclude_inherited,
CORBA::Long max_returned_objs,
CORBA::Environment &ACE_TRY_ENV
-@@ -14282,7 +14165,7 @@
- ))
- {
- return this->ptr_->describe_contents (
--limit_type,
-+ limit_type,
- exclude_inherited,
- max_returned_objs,
- ACE_TRY_ENV
-@@ -14301,7 +14184,7 @@
- ))
- {
- return this->ptr_->create_module (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
@@ -14313,7 +14196,7 @@
const char * id,
const char * name,
@@ -9021,15 +2749,6 @@
const CORBA::Any & value,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -14322,7 +14205,7 @@
- ))
- {
- return this->ptr_->create_constant (
--id,
-+ id,
- name,
- version,
- type,
@@ -14336,7 +14219,7 @@
const char * id,
const char * name,
@@ -9039,15 +2758,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -14344,7 +14227,7 @@
- ))
- {
- return this->ptr_->create_struct (
--id,
-+ id,
- name,
- version,
- members,
@@ -14357,8 +14240,8 @@
const char * id,
const char * name,
@@ -9059,15 +2769,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -14366,7 +14249,7 @@
- ))
- {
- return this->ptr_->create_union (
--id,
-+ id,
- name,
- version,
- discriminator_type,
@@ -14380,7 +14263,7 @@
const char * id,
const char * name,
@@ -9077,15 +2778,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -14388,7 +14271,7 @@
- ))
- {
- return this->ptr_->create_enum (
--id,
-+ id,
- name,
- version,
- members,
@@ -14401,7 +14284,7 @@
const char * id,
const char * name,
@@ -9095,15 +2787,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -14409,7 +14292,7 @@
- ))
- {
- return this->ptr_->create_alias (
--id,
-+ id,
- name,
- version,
- original_type,
@@ -14422,7 +14305,7 @@
const char * id,
const char * name,
@@ -9113,15 +2796,6 @@
CORBA::Boolean is_abstract,
CORBA::Boolean is_local,
CORBA::Environment &ACE_TRY_ENV
-@@ -14432,7 +14315,7 @@
- ))
- {
- return this->ptr_->create_interface (
--id,
-+ id,
- name,
- version,
- base_interfaces,
@@ -14449,11 +14332,11 @@
const char * version,
CORBA::Boolean is_custom,
@@ -9138,15 +2812,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -14461,7 +14344,7 @@
- ))
- {
- return this->ptr_->create_value (
--id,
-+ id,
- name,
- version,
- is_custom,
@@ -14480,7 +14363,7 @@
const char * id,
const char * name,
@@ -9156,15 +2821,6 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -14488,7 +14371,7 @@
- ))
- {
- return this->ptr_->create_value_box (
--id,
-+ id,
- name,
- version,
- original_type_def,
@@ -14501,7 +14384,7 @@
const char * id,
const char * name,
@@ -9174,113 +2830,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -14509,7 +14392,7 @@
- ))
- {
- return this->ptr_->create_exception (
--id,
-+ id,
- name,
- version,
- members,
-@@ -14529,7 +14412,7 @@
- ))
- {
- return this->ptr_->create_native (
--id,
-+ id,
- name,
- version,
- ACE_TRY_ENV
-@@ -14545,7 +14428,7 @@
- ))
- {
- return this->ptr_->id (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -14559,7 +14442,7 @@
- ))
- {
- this->ptr_->id (
--id,
-+ id,
- ACE_TRY_ENV
- );
- }
-@@ -14573,7 +14456,7 @@
- ))
- {
- return this->ptr_->name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -14587,7 +14470,7 @@
- ))
- {
- this->ptr_->name (
--name,
-+ name,
- ACE_TRY_ENV
- );
- }
-@@ -14601,7 +14484,7 @@
- ))
- {
- return this->ptr_->version (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -14615,7 +14498,7 @@
- ))
- {
- this->ptr_->version (
--version,
-+ version,
- ACE_TRY_ENV
- );
- }
-@@ -14629,7 +14512,7 @@
- ))
- {
- return this->ptr_->defined_in (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -14642,7 +14525,7 @@
- ))
- {
- return this->ptr_->absolute_name (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -14655,7 +14538,7 @@
- ))
- {
- return this->ptr_->containing_repository (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -14668,13 +14551,13 @@
- ))
- {
- return this->ptr_->describe (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
+@@ -14674,7 +14557,7 @@
template <class T> ACE_INLINE
void POA_IR::HomeDef_tie<T>::move (
@@ -9289,40 +2839,7 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -14684,7 +14567,7 @@
- ))
- {
- this->ptr_->move (
--new_container,
-+ new_container,
- new_name,
- new_version,
- ACE_TRY_ENV
-@@ -14700,7 +14583,7 @@
- ))
- {
- return this->ptr_->type (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -14713,7 +14596,7 @@
- ))
- {
- return this->ptr_->def_kind (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
- }
-
-@@ -14726,8 +14609,9 @@
- ))
- {
- this->ptr_->destroy (
--ACE_TRY_ENV
-+ ACE_TRY_ENV
- );
+@@ -14731,3 +14614,4 @@
}
#endif /* ACE_HAS_USING_KEYWORD */
diff --git a/TAO/tao/IFR_Client/Interface.pidl b/TAO/tao/IFR_Client/Interface.pidl
index 207680b18c7..de4c569cfa6 100644
--- a/TAO/tao/IFR_Client/Interface.pidl
+++ b/TAO/tao/IFR_Client/Interface.pidl
@@ -1,5 +1,67 @@
-//$Id$
-
+//
+// $Id$
+//
+// ================================================================
+//
+// = LIBRARY
+// IFR_Client
+//
+// = FILENAME
+// Interface.pidl
+//
+// = DESCRIPTION
+// This file was used to generate the code in InterfaceC.{h,i,cpp}.
+//
+// The command used to generate code from this file is:
+//
+// tao_idl -o orig -Ge 1 \
+// -Wb,export_macro=TAO_IFR_Client_Export \
+// -Wb,export_include=ifr_client_export.h \
+// -Wb,pre_include="ace/pre.h" \
+// -Wb,post_include="ace/post.h" \
+// Interface.pidl
+//
+// after the file is generated a patch must be applied. The patch
+// replaces qualified namespace scoping with flat names, since there
+// are at present two versions of Interface.idl, one where most of
+// the definitions are in the IR namespace and one where they are in
+// the CORBA namespace. Hopefully, the OMG will ultimately reconcile
+// the two versions, but until then we will be compliant with the
+// CORBA 2.x version, while leaving unchanged as much as possible
+// from the CCM (forthcoming CORBA 3.0) version. To that end, the
+// flat names are typedef'd in one or both namespaces.
+//
+// Apply patches using the following commands:
+//
+// patch < diffs/InterfaceC.h.diff
+// patch < diffs/InterfaceC.i.diff
+// patch < diffs/InterfaceC.cpp.diff
+//
+// These patches are used to automate the above changes when the
+// code, which is part of the TAO library, must be regenerated because
+// of modifications to the output of the TAO IDL compiler.
+//
+// Note: The diffs were generated with these commands:
+//
+// diff -wbu orig/InterfaceC.h InterfaceC.h > diffs/InterfaceC.h.diff
+// diff -wbu orig/InterfaceC.i InterfaceC.i > diffs/InterfaceC.i.diff
+// diff -wbu orig/InterfaceC.cpp InterfaceC.cpp > diffs/InterfaceC.cpp.diff
+//
+// To regenerate the skeleton files InterfaceS.{h,i,cpp} and
+// InterfaceS_T.{h,i.cpp} in ACE_ROOT/TAO/orbsvcs/IFR_Service, use the
+// command
+//
+// tao_idl -o ../../orbsvcs/IFR_Service/orig -Ge 1 \
+// -Wb,pre_include="ace/pre.h" \
+// -Wb,post_include="ace/post.h" \
+// Interface.pidl
+//
+// and the diff and patch commands change accordingly.
+//
+// ================================================================
+
+#ifndef _INTERFACE_IDL_
+#define _INTERFACE_IDL_
#pragma prefix "omg.org"
module IR
@@ -899,3 +961,4 @@ module IR
};
#pragma prefix ""
+#endif // _INTERFACE_IDL_
diff --git a/TAO/tao/IFR_Client/diffs/InterfaceC.cpp.diff b/TAO/tao/IFR_Client/diffs/InterfaceC.cpp.diff
index b84573a5c55..15233fa5776 100644
--- a/TAO/tao/IFR_Client/diffs/InterfaceC.cpp.diff
+++ b/TAO/tao/IFR_Client/diffs/InterfaceC.cpp.diff
@@ -1,5 +1,5 @@
---- InterfaceC.cpp Fri Jan 12 21:21:46 2001
-+++ ..\InterfaceC.cpp Fri Jan 12 21:33:01 2001
+--- orig/InterfaceC.cpp Fri Mar 09 00:47:29 2001
++++ InterfaceC.cpp Thu Mar 08 20:22:55 2001
@@ -1,6 +1,6 @@
// -*- C++ -*-
//
@@ -8,16 +8,22 @@
// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
// TAO and the TAO IDL Compiler have been developed by:
-@@ -20,6 +20,8 @@
+@@ -20,6 +20,14 @@
// http://www.cs.wustl.edu/~schmidt/TAO.html
#include "InterfaceC.h"
+#include "tao/Stub.h"
+#include "tao/Invocation.h"
++
++// The Following header must remain visible since it contains the
++// "TAO_INTERCEPTOR" macros. Note that this won't cause problems when
++// portable interceptor support is disabled since those macros are
++// always visible, too.
++#include "tao/PortableInterceptor.h"
#if TAO_HAS_INTERCEPTORS == 1
#include "tao/RequestInfo_Util.h"
-@@ -74,64 +76,25 @@
+@@ -74,64 +82,25 @@
12, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657300), // name = dk_Provides
8, ACE_NTOHL (0x646b5f55), ACE_NTOHL (0x73657300), // name = dk_Uses
};
@@ -86,7 +92,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -140,7 +103,7 @@
+@@ -140,7 +109,7 @@
))
{
@@ -95,176 +101,25 @@
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -156,151 +119,57 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -168,7 +137,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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)
-- ))
-- {
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-- _tao_retval
-- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -224,7 +193,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::DefinitionKind _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ ACE_CHECK_RETURN (_tao_retval);
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ _tao_retval
-+ );
- }
--
-- break;
-- }
-+ 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
-+ );
-+ }
-+ break;
-+ }
++ IR_DefinitionKind _tao_retval_info = _tao_retval;
+ ri.result (_tao_retval_info);
+ );
+
+@@ -289,7 +258,7 @@
return _tao_retval;
}
@@ -273,166 +128,27 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
+@@ -297,10 +266,6 @@
CORBA::SystemException
))
--{
+ {
-
-
-
-
-+{
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-@@ -314,120 +183,36 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -326,7 +291,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (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_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ ACE_CHECK;
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
- }
--
-- break;
-- }
--
-+
-+ break;
-+ }
- }
-
-
-@@ -440,32 +225,32 @@
++ CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -440,37 +405,36 @@
// Remote & Base Proxy Broker Implementation
//
@@ -446,16 +162,22 @@
{
}
--// 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)
+-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;
+
+ // Factory Member function Implementation.
+-CORBA::_TAO_IRObject_Remote_Proxy_Broker *
+-CORBA::_TAO_IRObject_Remote_Proxy_Broker::the_TAO_IRObject_Remote_Proxy_Broker (void)
++_TAO_IRObject_Remote_Proxy_Broker *
++_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)
{
@@ -475,14 +197,14 @@
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -481,139 +266,140 @@
+@@ -486,107 +450,107 @@
// default constructor
-CORBA::IRObject::IRObject (int collocated)
+CORBA_IRObject::CORBA_IRObject (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->CORBA_IRObject_setup_collocation (collocated);
}
// destructor
@@ -491,8 +213,8 @@
{}
void
--CORBA::IRObject::_tao_setup_collocation (int collocated)
-+CORBA_IRObject::_tao_setup_collocation (int collocated)
+-CORBA::IRObject::CORBA_IRObject_setup_collocation (int collocated)
++CORBA_IRObject::CORBA_IRObject_setup_collocation (int collocated)
{
if (collocated)
this->the_TAO_IRObject_Proxy_Broker_ =
@@ -501,231 +223,152 @@
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)
-- {
-- IRObject *tmp = ACE_static_cast (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 IRObject::_nil ();
-- if (! obj->_is_local ())
++ _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::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))
+ 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);
+ 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)
+ 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))
+ 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 ();
+ 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 () &&
+
+ 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
-+ )
+ )
{
-- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IRObject:1.0", ACE_TRY_ENV);
-- ACE_CHECK_RETURN (IRObject::_nil ());
-- if (is_a == 0)
-- return IRObject::_nil ();
-+ ACE_NEW_RETURN (
-+ default_proxy,
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::CORBA::IRObject (
+ CORBA_IRObject (
-+ stub,
-+ 1,
-+ obj->_servant ()),
-+
+ stub,
+ 1,
+ obj->_servant ()),
+
+- IRObject::_nil ());
+ CORBA_IRObject::_nil ());
-+ }
-+ if (CORBA::is_nil (default_proxy))
+ }
+ 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;
+ return default_proxy;
}
-- return IRObject::_unchecked_narrow (obj, ACE_TRY_ENV);
-- }
--
-- CORBA::IRObject_ptr CORBA::IRObject::_unchecked_narrow (
-- CORBA::Object_ptr obj,
-- CORBA::Environment &
-- )
-- {
-- if (CORBA::is_nil (obj))
-- return IRObject::_nil ();
-- if (! obj->_is_local ())
-- {
-- TAO_Stub* stub = obj->_stubobj ();
-- if (stub)
-- stub->_incr_refcnt ();
-- IRObject_ptr default_proxy = 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
-- )
-- {
-- ACE_NEW_RETURN (
-- default_proxy,
-- ::CORBA::IRObject (
-- stub,
-- 1,
-- obj->_servant ()),
--
-- IRObject::_nil ());
-- }
-- if (CORBA::is_nil (default_proxy))
-- ACE_NEW_RETURN (default_proxy, ::CORBA::IRObject (stub, 0, obj->_servant ()), IRObject::_nil ());
-- return default_proxy;
-- }
-- else
-- return
-- ACE_reinterpret_cast
-- (
-- IRObject_ptr,
-- obj->_tao_QueryInterface
-- (
-- ACE_reinterpret_cast
-- (
-- ptr_arith_t,
-- &IRObject::_narrow
-- )
-- )
-- );
-+ else
-+ return
-+ ACE_reinterpret_cast
-+ (
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- IRObject_ptr,
+ CORBA_IRObject_ptr,
-+ obj->_tao_QueryInterface
-+ (
-+ ACE_reinterpret_cast
-+ (
-+ ptr_arith_t,
+ 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::IRObject_ptr
-- CORBA::IRObject::_duplicate (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)
-- {
-- 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")))
+ {
+ 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")) ||
-+ (!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);
-- }
-+ else
-+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
-+}
-
-- 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))
-- 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;
-- }
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+@@ -596,12 +560,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,
+ {
+ 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 *,
-+ ACE_static_cast (CORBA::Object_ptr, this));
-+
-+ if (retv)
-+ this->_add_ref ();
-+ return retv;
-+}
-
-- const char* CORBA::IRObject::_interface_repository_id (void) const
-- {
-- return "IDL:omg.org/CORBA/IRObject:1.0";
-- }
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+@@ -612,12 +576,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";
-+}
+ {
+ 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 ((
-@@ -627,7 +413,7 @@
+@@ -626,7 +590,7 @@
+ {
+ _TAO_IRObject_Proxy_Impl &proxy =
+ this->the_TAO_IRObject_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+- ACE_CHECK_RETURN ((IR::DefinitionKind)0);
++ ACE_CHECK_RETURN ((IR_DefinitionKind)0);
+
+ return proxy.def_kind (
+ this,
+@@ -634,7 +598,7 @@
);
}
@@ -734,162 +377,112 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -641,211 +427,66 @@
+@@ -651,9 +615,8 @@
);
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -662,7 +625,7 @@
+ {}
+
+ Dynamic::ParameterList *
-CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -674,7 +637,7 @@
+ }
+
+ Dynamic::ExceptionList *
-CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -687,7 +650,7 @@
+
+
+ CORBA::Any *
-CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -703,13 +666,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::TAO_ClientRequestInfo_CORBA_IRObject_destroy (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -718,7 +681,7 @@
+ {}
+
+ Dynamic::ParameterList *
-CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -730,7 +693,7 @@
+ }
+
+ Dynamic::ExceptionList *
-CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -743,7 +706,7 @@
+
+
+ CORBA::Any *
-CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--#endif /* TAO_HAS_INTERCEPTORS */
--static const CORBA::Long _oc_CORBA_IRObject[] =
-+static const CORBA::Long _oc_IR_Identifier[] =
++CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
- TAO_ENCAP_BYTE_ORDER, // byte order
+ // Generate the result on demand.
+@@ -756,106 +719,68 @@
+ }
+
+ #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
-+ 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_CORBA_IRObject (CORBA::tk_objref, sizeof (_oc_CORBA_IRObject), (char *) &_oc_CORBA_IRObject, 0, sizeof (CORBA::IRObject));
-+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_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IRObject, &_tc_TAO_tc_CORBA_IRObject)
-+TAO_NAMESPACE_BEGIN (IR)
-+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Identifier, &_tc_TAO_tc_IR_Identifier)
- TAO_NAMESPACE_END
+-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_ValueModifier[] =
-+
-+static const CORBA::Long _oc_IR_ScopedName[] =
- {
- TAO_ENCAP_BYTE_ORDER, // byte order
+-{
+- TAO_ENCAP_BYTE_ORDER, // byte order
- 36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5661), ACE_NTOHL (0x6c75654d), ACE_NTOHL (0x6f646966), ACE_NTOHL (0x6965723a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/ValueModifier:1.0
- 14, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d6f64), ACE_NTOHL (0x69666965), ACE_NTOHL (0x72000000), // name = ValueModifier
- CORBA::tk_short,
-+ 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_CORBA_ValueModifier (CORBA::tk_alias, sizeof (_oc_CORBA_ValueModifier), (char *) &_oc_CORBA_ValueModifier, 0, sizeof (CORBA::ValueModifier));
-+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_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueModifier, &_tc_TAO_tc_CORBA_ValueModifier)
-TAO_NAMESPACE_END
@@ -908,9 +501,7 @@
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, VM_TRUNCATABLE, 3)
-+TAO_NAMESPACE_BEGIN (IR)
-+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ScopedName, &_tc_TAO_tc_IR_ScopedName)
- TAO_NAMESPACE_END
+-TAO_NAMESPACE_END
-static const CORBA::Long _oc_CORBA_Visibility[] =
-{
- TAO_ENCAP_BYTE_ORDER, // byte order
@@ -932,47 +523,60 @@
-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
--};
--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
--};
--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_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 = 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
+ 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));
@@ -984,7 +588,7 @@
static const CORBA::Long _oc_IR_VersionSpec[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -864,15 +505,15 @@
+@@ -874,15 +799,15 @@
// Base & Remote Proxy Implementation.
//
@@ -1003,177 +607,16 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -897,141 +538,50 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -919,7 +844,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-- char * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-+ 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_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ 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)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
--
-- break;
-- }
-+ 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;
-+ }
++ IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -1041,7 +966,7 @@
return _tao_safe_retval._retn ();
}
@@ -1182,180 +625,28 @@
CORBA_Object *_collocated_tao_target_,
const char * id,
CORBA::Environment &ACE_TRY_ENV
-@@ -1039,11 +589,7 @@
- ACE_THROW_SPEC ((
+@@ -1050,10 +975,6 @@
CORBA::SystemException
))
--{
+ {
-
-
-
-
-+{
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-@@ -1057,144 +603,57 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-+ ACE_CHECK;
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
+@@ -1079,7 +1000,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
- }
--
-- break;
-- }
--
-+
-+ break;
-+ }
+ #if TAO_HAS_INTERCEPTORS == 1
+- IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_set ri (
++ IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -1193,7 +1114,7 @@
+
}
-char * IR::_TAO_Contained_Remote_Proxy_Impl::name (
@@ -1363,190 +654,27 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
+@@ -1201,10 +1122,8 @@
CORBA::SystemException
))
--{
+ {
-
-+{
CORBA::String_var _tao_safe_retval;
+
-
--
-+
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-@@ -1208,141 +667,50 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -1230,7 +1149,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-- char * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-+ 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_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ 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)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
--
-- break;
-- }
-+ 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;
-+ }
++ IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -1352,7 +1271,7 @@
return _tao_safe_retval._retn ();
}
@@ -1555,361 +683,45 @@
CORBA_Object *_collocated_tao_target_,
const char * name,
CORBA::Environment &ACE_TRY_ENV
-@@ -1350,11 +718,7 @@
- ACE_THROW_SPEC ((
+@@ -1361,10 +1280,6 @@
CORBA::SystemException
))
--{
+ {
-
-
-
-
-+{
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-@@ -1368,135 +732,50 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- name,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << name)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-+ ACE_CHECK;
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << name)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
+@@ -1390,7 +1305,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
- }
--
-- break;
-- }
--
-+
-+ break;
-+ }
+ #if TAO_HAS_INTERCEPTORS == 1
+- IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_set ri (
++ IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ name,
+@@ -1504,7 +1419,7 @@
+
}
-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
+ CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
-@@ -1519,141 +798,50 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -1541,7 +1456,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-- char * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-+ 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_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ 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)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
--
-- break;
-- }
-+ 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;
-+ }
++ IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -1663,7 +1578,7 @@
return _tao_safe_retval._retn ();
}
@@ -1918,184 +730,33 @@
CORBA_Object *_collocated_tao_target_,
const char * version,
CORBA::Environment &ACE_TRY_ENV
-@@ -1661,15 +849,10 @@
- ACE_THROW_SPEC ((
+@@ -1672,15 +1587,10 @@
CORBA::SystemException
))
--{
+ {
-
-
-
-
-+{
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
--
-
- TAO_GIOP_Twoway_Invocation _tao_call (
- istub,
-@@ -1679,149 +862,62 @@
- istub->orb_core ()
- );
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- version,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << version)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-+ ACE_CHECK;
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << version)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_version",
+@@ -1701,7 +1611,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
- }
--
-- break;
-- }
--
-+
-+ break;
-+ }
+ #if TAO_HAS_INTERCEPTORS == 1
+- IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_set ri (
++ IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ version,
+@@ -1815,7 +1725,7 @@
+
}
-IR::Container_ptr IR::_TAO_Contained_Remote_Proxy_Impl::defined_in (
@@ -2103,14 +764,13 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
+@@ -1823,16 +1733,14 @@
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);
@@ -2118,181 +778,30 @@
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
--
-
- TAO_GIOP_Twoway_Invocation _tao_call (
- istub,
-@@ -1831,156 +927,62 @@
- istub->orb_core ()
- );
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_defined_in",
+@@ -1853,7 +1761,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -1909,7 +1817,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-+ 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_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ 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)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
--
-- break;
-- }
-+ 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;
-+ }
++ IR_Container_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -1975,7 +1883,7 @@
return _tao_safe_retval._retn ();
}
@@ -2301,194 +810,32 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
+@@ -1983,15 +1891,12 @@
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,
-@@ -1990,157 +992,63 @@
- istub->orb_core ()
- );
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_absolute_name",
+@@ -2012,7 +1917,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-- char * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-+ 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_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ 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)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
--
-- break;
-- }
-+ 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;
-+ }
++ IR_Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -2134,7 +2039,7 @@
return _tao_safe_retval._retn ();
}
@@ -2497,197 +844,44 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
+@@ -2142,16 +2047,13 @@
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,
-@@ -2150,158 +1058,65 @@
- istub->orb_core ()
- );
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_containing_repository",
+@@ -2172,7 +2074,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -2228,7 +2130,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-+ 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_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ 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)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
--
-- break;
-- }
-+ 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;
-+ }
++ IR_Repository_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -2294,7 +2196,7 @@
return _tao_safe_retval._retn ();
}
@@ -2696,20 +890,19 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
+@@ -2302,16 +2204,14 @@
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);
@@ -2717,177 +910,25 @@
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"describe",
-@@ -2310,143 +1125,52 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -2332,7 +2232,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Contained::TAO_ClientRequestInfo_IR_Contained_describe ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_Contained::TAO_ClientRequestInfo_IR_Contained_describe ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -2388,7 +2288,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-+ 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_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ 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)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
--
-- break;
-- }
-+ 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;
-+ }
++ IR_Contained::Description * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -2454,9 +2354,9 @@
return _tao_safe_retval._retn ();
}
@@ -2899,196 +940,32 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -2454,16 +1178,11 @@
- ACE_THROW_SPEC ((
+@@ -2465,15 +2365,10 @@
CORBA::SystemException
))
--{
+ {
-
-
-
-
-+{
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
--
+
-
-+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"move",
-@@ -2472,134 +1191,47 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- IR::Contained::TAO_ClientRequestInfo_IR_Contained_move ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- new_container,
-- new_name,
-- new_version,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << new_container) &&
-- (_tao_out << new_name) &&
-- (_tao_out << new_version)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- 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_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
+@@ -2494,7 +2389,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
- }
--
-- break;
-- }
--
-+
-+ break;
-+ }
- }
-
-
-@@ -2612,32 +1244,32 @@
+ #if TAO_HAS_INTERCEPTORS == 1
+- IR::Contained::TAO_ClientRequestInfo_IR_Contained_move ri (
++ IR_Contained::TAO_ClientRequestInfo_IR_Contained_move ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ new_container,
+@@ -2622,37 +2517,37 @@
// Remote & Base Proxy Broker Implementation
//
@@ -3102,10 +979,16 @@
{
}
--// 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)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_Contained_Remote_Proxy_Broker *
+-IR::_TAO_Contained_Remote_Proxy_Broker::the_TAO_Contained_Remote_Proxy_Broker (void)
++_TAO_Contained_Remote_Proxy_Broker *
++_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;
@@ -3131,14 +1014,14 @@
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -2653,109 +1285,109 @@
+@@ -2668,109 +2563,109 @@
// default constructor
-IR::Contained::Contained (int collocated)
+IR_Contained::IR_Contained (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_Contained_setup_collocation (collocated);
}
// destructor
@@ -3147,8 +1030,8 @@
{}
void
--IR::Contained::_tao_setup_collocation (int collocated)
-+IR_Contained::_tao_setup_collocation (int collocated)
+-IR::Contained::IR_Contained_setup_collocation (int collocated)
++IR_Contained::IR_Contained_setup_collocation (int collocated)
{
if (collocated)
this->the_TAO_Contained_Proxy_Broker_ =
@@ -3157,10 +1040,9 @@
else
this->the_TAO_Contained_Proxy_Broker_ =
- ::IR::_TAO_Contained_Remote_Proxy_Broker::the_TAO_Contained_Remote_Proxy_Broker ();
-+ ::the_TAO_Contained_Remote_Proxy_Broker ();
++ _TAO_Contained_Remote_Proxy_Broker::the_TAO_Contained_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (CORBA, IRObject)::_tao_setup_collocation (collocated);
-+ CORBA_IRObject::_tao_setup_collocation (collocated);
+ this->CORBA_IRObject_setup_collocation (collocated);
}
-void IR::Contained::_tao_any_destructor (void *x)
@@ -3266,7 +1148,7 @@
{
if (
(!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
-@@ -2766,22 +1398,22 @@
+@@ -2781,22 +2676,22 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
@@ -3293,7 +1175,7 @@
this
)
);
-@@ -2794,34 +1426,32 @@
+@@ -2809,12 +2704,12 @@
return retv;
}
@@ -3308,14 +1190,7 @@
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
+@@ -2831,7 +2726,7 @@
);
}
@@ -3324,16 +1199,7 @@
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,
-@@ -2829,7 +1459,7 @@
+@@ -2850,7 +2745,7 @@
);
}
@@ -3342,7 +1208,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -2843,15 +1473,14 @@
+@@ -2867,7 +2762,7 @@
);
}
@@ -3351,16 +1217,7 @@
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,
-@@ -2859,29 +1488,27 @@
+@@ -2886,7 +2781,7 @@
);
}
@@ -3369,14 +1226,7 @@
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
+@@ -2903,7 +2798,7 @@
);
}
@@ -3385,16 +1235,7 @@
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,
-@@ -2889,42 +1516,39 @@
+@@ -2922,7 +2817,7 @@
);
}
@@ -3403,14 +1244,7 @@
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
+@@ -2939,7 +2834,7 @@
);
}
@@ -3419,14 +1253,7 @@
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
+@@ -2956,7 +2851,7 @@
);
}
@@ -3435,15 +1262,7 @@
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
-@@ -2983,31 +1607,30 @@
+@@ -3025,16 +2920,16 @@
CORBA::tk_any,
};
@@ -3464,14 +1283,7 @@
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
+@@ -3051,8 +2946,8 @@
);
}
@@ -3482,721 +1294,503 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -3015,8 +1638,7 @@
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ))
--{
--
-+{
- this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).move (
- this,
- new_container,
-@@ -3026,782 +1648,140 @@
+@@ -3074,9 +2969,8 @@
);
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_get::TAO_ClientRequestInfo_IR_Contained_id_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_get::TAO_ClientRequestInfo_IR_Contained_id_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -3085,7 +2979,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -3097,7 +2991,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -3110,7 +3004,7 @@
+
+
+ CORBA::Any *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -3126,13 +3020,13 @@
+ }
+
+ void
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_get::result (char * result)
-+static const CORBA::Long _oc_IR_Contained[] =
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_get::result (char * result)
{
-- // update the result
-- this->_result = result;
--}
--
+ // update the result
+ this->_result = result;
+ }
+
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_set::TAO_ClientRequestInfo_IR_Contained_id_set (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id)
--{}
-+ 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
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_set::TAO_ClientRequestInfo_IR_Contained_id_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * id,
+@@ -3143,7 +3037,7 @@
+ {}
--Dynamic::ParameterList *
+ Dynamic::ParameterList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-+ // 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);
-
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -3162,7 +3056,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -3175,7 +3069,7 @@
+
+
+ CORBA::Any *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -3187,7 +3081,7 @@
+ return result_any;
+ }
+
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_get::TAO_ClientRequestInfo_IR_Contained_name_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_get::TAO_ClientRequestInfo_IR_Contained_name_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -3196,7 +3090,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -3208,7 +3102,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -3221,7 +3115,7 @@
+
+
+ CORBA::Any *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -3237,13 +3131,13 @@
+ }
+
+ 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_get::result (char * result)
+ {
+ // update the result
+ this->_result = result;
+ }
+
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_set::TAO_ClientRequestInfo_IR_Contained_name_set (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * name,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- name_ (name)
--{}
--
--Dynamic::ParameterList *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_set::TAO_ClientRequestInfo_IR_Contained_name_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * name,
+@@ -3254,7 +3148,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -3273,7 +3167,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -3286,7 +3180,7 @@
+
+
+ CORBA::Any *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -3298,7 +3192,7 @@
+ return result_any;
+ }
+
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_get::TAO_ClientRequestInfo_IR_Contained_version_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_get::TAO_ClientRequestInfo_IR_Contained_version_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -3307,7 +3201,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -3319,7 +3213,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -3332,7 +3226,7 @@
+
+
+ CORBA::Any *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -3348,13 +3242,13 @@
+ }
+
+ 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_get::result (char * result)
+ {
+ // update the result
+ this->_result = result;
+ }
+
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_set::TAO_ClientRequestInfo_IR_Contained_version_set (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * version,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- version_ (version)
--{}
--
--Dynamic::ParameterList *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_set::TAO_ClientRequestInfo_IR_Contained_version_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * version,
+@@ -3365,7 +3259,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -3384,7 +3278,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -3397,7 +3291,7 @@
+
+
+ CORBA::Any *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -3409,7 +3303,7 @@
+ return result_any;
+ }
+
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::TAO_ClientRequestInfo_IR_Contained_defined_in_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::TAO_ClientRequestInfo_IR_Contained_defined_in_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -3418,7 +3312,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -3430,7 +3324,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -3443,7 +3337,7 @@
+
+
+ CORBA::Any *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -3459,13 +3353,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::TAO_ClientRequestInfo_IR_Contained_absolute_name_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -3474,7 +3368,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -3486,7 +3380,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -3499,7 +3393,7 @@
+
+
+ CORBA::Any *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -3515,13 +3409,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::TAO_ClientRequestInfo_IR_Contained_containing_repository_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -3530,7 +3424,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -3542,7 +3436,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -3555,7 +3449,7 @@
+
+
+ CORBA::Any *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -3571,13 +3465,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_describe::TAO_ClientRequestInfo_IR_Contained_describe (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -3586,7 +3480,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_describe::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_describe::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -3598,7 +3492,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_describe::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_describe::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -3611,7 +3505,7 @@
+
+
+ CORBA::Any *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_describe::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_describe::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -3627,16 +3521,16 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_move::TAO_ClientRequestInfo_IR_Contained_move (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- IR::Container_ptr new_container,
-- const char * new_name,
-- const char * new_version,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- new_container_ (new_container),
-- new_name_ (new_name),
-- new_version_ (new_version)
--{}
--
--Dynamic::ParameterList *
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &
+@@ -3648,7 +3542,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_move::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_new_container = parameter_list->length ();
-- parameter_list->length (length_new_container + 1);
-- (*parameter_list)[length_new_container].argument <<= this->new_container_;
--
-- (*parameter_list)[length_new_container].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_new_name = parameter_list->length ();
-- parameter_list->length (length_new_name + 1);
-- (*parameter_list)[length_new_name].argument <<= new_name_;
-- (*parameter_list)[length_new_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_new_version = parameter_list->length ();
-- parameter_list->length (length_new_version + 1);
-- (*parameter_list)[length_new_version].argument <<= new_version_;
-- (*parameter_list)[length_new_version].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_move::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -3678,7 +3572,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_move::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_move::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -3691,7 +3585,7 @@
+
+
+ CORBA::Any *
-IR::Contained::TAO_ClientRequestInfo_IR_Contained_move::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--#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
++IR_Contained::TAO_ClientRequestInfo_IR_Contained_move::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -3704,13 +3598,14 @@
+ }
+
+ #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
--};
++ 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)
--
++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)
+@@ -3718,22 +3613,19 @@
+
+ #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
+ // The Base_Sequence functions, please see tao/Sequence.h
+ void
- IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
-- {
++ _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 **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;
-- }
-+ 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_)
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ if (!this->release_)
+- tmp[i] = IR::InterfaceDef::_duplicate (old[i]);
+ tmp[i] = IR_InterfaceDef::_duplicate (old[i]);
-+ else
-+ tmp[i] = old[i];
-+
-+ if (this->release_)
-+ delete[] old;
-+
-+ }
-+ this->buffer_ = tmp;
-+ }
+ else
+ tmp[i] = old[i];
+
+@@ -3745,111 +3637,102 @@
+ }
void
- IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_deallocate_buffer (void)
@@ -4331,7 +1925,7 @@
CORBA::tk_sequence, // typecode kind
76, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -3809,12 +1789,12 @@
+@@ -3857,12 +3740,12 @@
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
@@ -4346,7 +1940,7 @@
TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InterfaceDefSeq, &_tc_TAO_tc_IR_InterfaceDefSeq)
-@@ -3822,22 +1802,19 @@
+@@ -3870,22 +3753,19 @@
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
@@ -4373,7 +1967,7 @@
else
tmp[i] = old[i];
-@@ -3849,111 +1826,102 @@
+@@ -3897,111 +3777,102 @@
}
void
@@ -4509,7 +2103,7 @@
CORBA::tk_sequence, // typecode kind
68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -3961,12 +1929,12 @@
+@@ -4009,12 +3880,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
@@ -4524,7 +2118,7 @@
TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueDefSeq, &_tc_TAO_tc_IR_ValueDefSeq)
-@@ -3974,22 +1942,19 @@
+@@ -4022,22 +3893,19 @@
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
@@ -4551,7 +2145,7 @@
else
tmp[i] = old[i];
-@@ -4001,111 +1966,102 @@
+@@ -4049,111 +3917,102 @@
}
void
@@ -4687,7 +2281,7 @@
CORBA::tk_sequence, // typecode kind
76, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -4113,12 +2069,12 @@
+@@ -4161,12 +4020,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
@@ -4702,7 +2296,7 @@
TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentDefSeq, &_tc_TAO_tc_IR_ComponentDefSeq)
-@@ -4126,22 +2082,19 @@
+@@ -4174,22 +4033,19 @@
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
@@ -4729,7 +2323,7 @@
else
tmp[i] = old[i];
-@@ -4153,111 +2106,102 @@
+@@ -4201,111 +4057,102 @@
}
void
@@ -4865,7 +2459,7 @@
CORBA::tk_sequence, // typecode kind
72, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -4265,12 +2209,12 @@
+@@ -4313,12 +4160,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
@@ -4880,7 +2474,7 @@
TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProvidesDefSeq, &_tc_TAO_tc_IR_ProvidesDefSeq)
-@@ -4278,22 +2222,19 @@
+@@ -4326,22 +4173,19 @@
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
@@ -4907,7 +2501,7 @@
else
tmp[i] = old[i];
-@@ -4305,111 +2246,102 @@
+@@ -4353,111 +4197,102 @@
}
void
@@ -5043,7 +2637,7 @@
CORBA::tk_sequence, // typecode kind
64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -4417,12 +2349,12 @@
+@@ -4465,12 +4300,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
@@ -5058,7 +2652,7 @@
TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDefSeq, &_tc_TAO_tc_IR_UsesDefSeq)
-@@ -4430,22 +2362,19 @@
+@@ -4478,22 +4313,19 @@
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
@@ -5085,7 +2679,7 @@
else
tmp[i] = old[i];
-@@ -4457,111 +2386,102 @@
+@@ -4505,111 +4337,102 @@
}
void
@@ -5221,7 +2815,7 @@
CORBA::tk_sequence, // typecode kind
64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -4569,12 +2489,12 @@
+@@ -4617,12 +4440,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
@@ -5236,7 +2830,7 @@
TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_HomeDefSeq, &_tc_TAO_tc_IR_HomeDefSeq)
-@@ -4582,22 +2502,19 @@
+@@ -4630,22 +4453,19 @@
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
@@ -5263,7 +2857,7 @@
else
tmp[i] = old[i];
-@@ -4609,111 +2526,102 @@
+@@ -4657,111 +4477,102 @@
}
void
@@ -5399,7 +2993,7 @@
CORBA::tk_sequence, // typecode kind
68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -4721,12 +2629,12 @@
+@@ -4769,12 +4580,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
@@ -5414,7 +3008,7 @@
TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EmitsDefSeq, &_tc_TAO_tc_IR_EmitsDefSeq)
-@@ -4734,22 +2642,19 @@
+@@ -4782,22 +4593,19 @@
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
@@ -5441,7 +3035,7 @@
else
tmp[i] = old[i];
-@@ -4761,111 +2666,102 @@
+@@ -4809,111 +4617,102 @@
}
void
@@ -5577,7 +3171,7 @@
CORBA::tk_sequence, // typecode kind
76, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -4873,12 +2769,12 @@
+@@ -4921,12 +4720,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
@@ -5592,7 +3186,7 @@
TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PublishesDefSeq, &_tc_TAO_tc_IR_PublishesDefSeq)
-@@ -4886,22 +2782,19 @@
+@@ -4934,22 +4733,19 @@
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
@@ -5619,7 +3213,7 @@
else
tmp[i] = old[i];
-@@ -4913,111 +2806,102 @@
+@@ -4961,111 +4757,102 @@
}
void
@@ -5755,7 +3349,7 @@
CORBA::tk_sequence, // typecode kind
72, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -5025,12 +2909,12 @@
+@@ -5073,12 +4860,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
@@ -5770,7 +3364,7 @@
TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConsumesDefSeq, &_tc_TAO_tc_IR_ConsumesDefSeq)
-@@ -5038,22 +2922,19 @@
+@@ -5086,22 +4873,19 @@
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
@@ -5797,7 +3391,7 @@
else
tmp[i] = old[i];
-@@ -5065,111 +2946,102 @@
+@@ -5113,111 +4897,102 @@
}
void
@@ -5933,7 +3527,7 @@
CORBA::tk_sequence, // typecode kind
72, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -5177,12 +3049,12 @@
+@@ -5225,12 +5000,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
@@ -5948,7 +3542,7 @@
TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FactoryDefSeq, &_tc_TAO_tc_IR_FactoryDefSeq)
-@@ -5190,22 +3062,19 @@
+@@ -5238,22 +5013,19 @@
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
@@ -5975,7 +3569,7 @@
else
tmp[i] = old[i];
-@@ -5217,111 +3086,102 @@
+@@ -5265,111 +5037,102 @@
}
void
@@ -6111,7 +3705,7 @@
CORBA::tk_sequence, // typecode kind
72, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -5329,12 +3189,12 @@
+@@ -5377,12 +5140,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
@@ -6126,7 +3720,7 @@
TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FinderDefSeq, &_tc_TAO_tc_IR_FinderDefSeq)
-@@ -5342,22 +3202,19 @@
+@@ -5390,22 +5153,19 @@
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
@@ -6153,7 +3747,7 @@
else
tmp[i] = old[i];
-@@ -5369,111 +3226,102 @@
+@@ -5417,111 +5177,102 @@
}
void
@@ -6289,7 +3883,7 @@
CORBA::tk_sequence, // typecode kind
72, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -5481,21 +3329,22 @@
+@@ -5529,21 +5280,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
@@ -6315,7 +3909,7 @@
3, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
-@@ -5514,35 +3363,32 @@
+@@ -5562,35 +5314,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
@@ -6359,7 +3953,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp[i] = old[i];
-@@ -5555,80 +3401,70 @@
+@@ -5603,80 +5352,70 @@
}
void
@@ -6455,7 +4049,7 @@
CORBA::tk_sequence, // typecode kind
252, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -5636,7 +3472,7 @@
+@@ -5684,7 +5423,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
@@ -6464,7 +4058,7 @@
3, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
-@@ -5655,29 +3491,30 @@
+@@ -5703,29 +5442,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
@@ -6499,7 +4093,7 @@
CORBA::tk_sequence, // typecode kind
252, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -5685,7 +3522,7 @@
+@@ -5733,7 +5473,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
@@ -6508,7 +4102,7 @@
3, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
-@@ -5704,7 +3541,7 @@
+@@ -5752,7 +5492,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
@@ -6517,7 +4111,7 @@
0U,
-@@ -5720,32 +3557,29 @@
+@@ -5768,32 +5508,29 @@
0U, // string length
};
@@ -6557,7 +4151,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp[i] = old[i];
-@@ -5758,80 +3592,70 @@
+@@ -5806,80 +5543,70 @@
}
void
@@ -6653,7 +4247,7 @@
CORBA::tk_sequence, // typecode kind
504, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -5839,14 +3663,14 @@
+@@ -5887,14 +5614,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
@@ -6670,7 +4264,7 @@
CORBA::tk_sequence, // typecode kind
252, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -5854,7 +3678,7 @@
+@@ -5902,7 +5629,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
@@ -6679,7 +4273,7 @@
3, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
-@@ -5873,7 +3697,7 @@
+@@ -5921,7 +5648,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
@@ -6688,7 +4282,7 @@
0U,
-@@ -5892,16 +3716,17 @@
+@@ -5940,16 +5667,17 @@
0U,
};
@@ -6708,7 +4302,7 @@
4, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
-@@ -5923,35 +3748,32 @@
+@@ -5971,35 +5699,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
@@ -6752,7 +4346,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp[i] = old[i];
-@@ -5964,80 +3786,70 @@
+@@ -6012,80 +5737,70 @@
}
void
@@ -6848,7 +4442,7 @@
CORBA::tk_sequence, // typecode kind
264, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -6045,7 +3857,7 @@
+@@ -6093,7 +5808,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
@@ -6857,7 +4451,7 @@
4, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
-@@ -6067,28 +3879,25 @@
+@@ -6115,28 +5830,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
@@ -6891,7 +4485,7 @@
:
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_String_Sequence
-@@ -6097,7 +3906,7 @@
+@@ -6145,7 +5857,7 @@
#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
@@ -6900,7 +4494,7 @@
:
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_String_Sequence
-@@ -6106,7 +3915,7 @@
+@@ -6154,7 +5866,7 @@
#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
@@ -6909,7 +4503,7 @@
:
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_String_Sequence
-@@ -6115,22 +3924,19 @@
+@@ -6163,22 +5875,19 @@
#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
@@ -6936,7 +4530,7 @@
CORBA::tk_sequence, // typecode kind
80, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -6145,7 +3951,7 @@
+@@ -6193,7 +5902,7 @@
0U,
};
@@ -6945,7 +4539,7 @@
TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EnumMemberSeq, &_tc_TAO_tc_IR_EnumMemberSeq)
-@@ -6155,15 +3961,15 @@
+@@ -6203,15 +5912,15 @@
// Base & Remote Proxy Implementation.
//
@@ -6964,210 +4558,37 @@
CORBA_Object *_collocated_tao_target_,
const char * search_name,
CORBA::Environment &ACE_TRY_ENV
-@@ -6171,10 +3977,9 @@
- ACE_THROW_SPEC ((
+@@ -6220,9 +5929,8 @@
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 ();
-@@ -6190,172 +3995,77 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -6250,7 +5958,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Container::TAO_ClientRequestInfo_IR_Container_lookup ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- search_name,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << search_name)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-- 0
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_Container::TAO_ClientRequestInfo_IR_Container_lookup ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ search_name,
+@@ -6317,7 +6025,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ 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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- 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_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
-
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ 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)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
--
-- break;
-- }
-+ 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;
-+ }
++ IR_Contained_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -6383,9 +6091,9 @@
return _tao_safe_retval._retn ();
}
@@ -7179,22 +4600,20 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
+@@ -6393,17 +6101,14 @@
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);
@@ -7202,199 +4621,25 @@
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"contents",
-@@ -6364,176 +4074,80 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -6424,7 +6129,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Container::TAO_ClientRequestInfo_IR_Container_contents ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- limit_type,
-- exclude_inherited,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_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 (
-- CORBA::MARSHAL (),
-- 0
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_Container::TAO_ClientRequestInfo_IR_Container_contents ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ limit_type,
+@@ -6493,7 +6198,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ 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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- 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_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
-
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ 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)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
--
-- break;
-- }
-+ 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;
-+ }
++ IR_ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -6559,11 +6264,11 @@
return _tao_safe_retval._retn ();
}
@@ -7408,14 +4653,13 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
+@@ -6571,17 +6276,14 @@
CORBA::SystemException
))
--{
+ {
-
- IR::ContainedSeq *_tao_retval = 0;
-
-+{
+ IR_ContainedSeq *_tao_retval = 0;
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -7430,203 +4674,25 @@
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"lookup_name",
-@@ -6542,160 +4156,66 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -6602,7 +6304,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Container::TAO_ClientRequestInfo_IR_Container_lookup_name ri (
-- &_tao_call,
-- _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 */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << search_name) &&
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << search_name) &&
- (_tao_out << levels_to_search) &&
- (_tao_out << limit_type) &&
- (_tao_out << CORBA::Any::from_boolean (exclude_inherited))
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_Container::TAO_ClientRequestInfo_IR_Container_lookup_name ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ search_name,
+@@ -6675,7 +6377,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -6741,9 +6443,9 @@
return _tao_safe_retval._retn ();
}
@@ -7638,7 +4704,7 @@
CORBA::Boolean exclude_inherited,
CORBA::Long max_returned_objs,
CORBA::Environment &ACE_TRY_ENV
-@@ -6704,17 +4224,14 @@
+@@ -6752,17 +6454,14 @@
CORBA::SystemException
))
{
@@ -7650,8 +4716,8 @@
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);
@@ -7659,201 +4725,25 @@
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"describe_contents",
-@@ -6723,156 +4240,62 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -6783,7 +6482,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Container::TAO_ClientRequestInfo_IR_Container_describe_contents ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- limit_type,
-- exclude_inherited,
-- max_returned_objs,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << limit_type) &&
-+ 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);
-+
-+ 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)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_Container::TAO_ClientRequestInfo_IR_Container_describe_contents ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ limit_type,
+@@ -6854,7 +6553,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-+ }
-+ break;
-+ }
++ IR_Container::DescriptionSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -6920,7 +6619,7 @@
return _tao_safe_retval._retn ();
}
@@ -7862,7 +4752,7 @@
CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
-@@ -6883,16 +4306,13 @@
+@@ -6931,16 +6630,13 @@
CORBA::SystemException
))
{
@@ -7881,201 +4771,25 @@
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_module",
-@@ -6901,161 +4321,68 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -6961,7 +6657,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Container::TAO_ClientRequestInfo_IR_Container_create_module ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- name,
-- version,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
- (_tao_out << name) &&
- (_tao_out << version)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_Container::TAO_ClientRequestInfo_IR_Container_create_module ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -7032,7 +6728,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_ModuleDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -7098,12 +6794,12 @@
return _tao_safe_retval._retn ();
}
@@ -8090,7 +4804,7 @@
const CORBA::Any & value,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -7063,15 +4390,12 @@
+@@ -7111,16 +6807,13 @@
CORBA::SystemException
))
{
@@ -8104,209 +4818,30 @@
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
--
-
- TAO_GIOP_Twoway_Invocation _tao_call (
- istub,
-@@ -7081,181 +4405,83 @@
- istub->orb_core ()
- );
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "create_constant",
+@@ -7141,7 +6834,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Container::TAO_ClientRequestInfo_IR_Container_create_constant ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- name,
-- version,
-- type,
-- value,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
- (_tao_out << name) &&
- (_tao_out << version) &&
- (_tao_out << type) &&
- (_tao_out << value)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_Container::TAO_ClientRequestInfo_IR_Container_create_constant ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -7216,7 +6909,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_ConstantDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -7282,28 +6975,25 @@
return _tao_safe_retval._retn ();
}
@@ -8339,203 +4874,25 @@
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_struct",
-@@ -7264,180 +4490,83 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -7324,7 +7014,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Container::TAO_ClientRequestInfo_IR_Container_create_struct ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- name,
-- version,
-- members,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
- (_tao_out << name) &&
- (_tao_out << version) &&
- (_tao_out << members)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_Container::TAO_ClientRequestInfo_IR_Container_create_struct ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -7397,7 +7087,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_StructDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -7463,29 +7153,26 @@
return _tao_safe_retval._retn ();
}
@@ -8570,205 +4927,25 @@
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_union",
-@@ -7446,181 +4575,83 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -7506,7 +7193,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Container::TAO_ClientRequestInfo_IR_Container_create_union ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- name,
-- version,
-- discriminator_type,
-- members,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
- (_tao_out << name) &&
- (_tao_out << version) &&
- (_tao_out << discriminator_type) &&
- (_tao_out << members)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_Container::TAO_ClientRequestInfo_IR_Container_create_union ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -7581,7 +7268,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_UnionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -7647,28 +7334,25 @@
return _tao_safe_retval._retn ();
}
@@ -8801,203 +4978,25 @@
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_enum",
-@@ -7629,179 +4660,82 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -7689,7 +7373,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Container::TAO_ClientRequestInfo_IR_Container_create_enum ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- name,
-- version,
-- members,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
- (_tao_out << name) &&
- (_tao_out << version) &&
- (_tao_out << members)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_Container::TAO_ClientRequestInfo_IR_Container_create_enum ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -7762,7 +7446,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_EnumDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -7828,28 +7512,25 @@
return _tao_safe_retval._retn ();
}
@@ -9030,203 +5029,25 @@
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_alias",
-@@ -7810,163 +4744,69 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -7870,7 +7551,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Container::TAO_ClientRequestInfo_IR_Container_create_alias ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- name,
-- version,
-- original_type,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
- (_tao_out << name) &&
- (_tao_out << version) &&
- (_tao_out << original_type)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_Container::TAO_ClientRequestInfo_IR_Container_create_alias ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -7943,7 +7624,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_AliasDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -8009,12 +7690,12 @@
return _tao_safe_retval._retn ();
}
@@ -9241,7 +5062,7 @@
CORBA::Boolean is_abstract,
CORBA::Boolean is_local,
CORBA::Environment &ACE_TRY_ENV
-@@ -7975,16 +4815,14 @@
+@@ -8023,16 +7704,14 @@
CORBA::SystemException
))
{
@@ -9260,207 +5081,25 @@
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_interface",
-@@ -7993,189 +4831,90 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -8053,7 +7732,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Container::TAO_ClientRequestInfo_IR_Container_create_interface ri (
-- &_tao_call,
-- _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 */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
- (_tao_out << name) &&
- (_tao_out << version) &&
- (_tao_out << base_interfaces) &&
- (_tao_out << CORBA::Any::from_boolean (is_abstract)) &&
- (_tao_out << CORBA::Any::from_boolean (is_local))
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_Container::TAO_ClientRequestInfo_IR_Container_create_interface ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -8130,7 +7809,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -8196,34 +7875,31 @@
return _tao_safe_retval._retn ();
}
@@ -9502,213 +5141,25 @@
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_value",
-@@ -8184,62 +4923,22 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -8244,7 +7920,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Container::TAO_ClientRequestInfo_IR_Container_create_value ri (
-- &_tao_call,
-- _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 */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
- (_tao_out << name) &&
- (_tao_out << version) &&
- (_tao_out << CORBA::Any::from_boolean (is_custom)) &&
-@@ -8249,126 +4948,63 @@
- (_tao_out << abstract_base_values) &&
- (_tao_out << supported_interfaces) &&
- (_tao_out << initializers)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_Container::TAO_ClientRequestInfo_IR_Container_create_value ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -8329,7 +8005,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -8395,28 +8071,25 @@
return _tao_safe_retval._retn ();
}
@@ -9741,203 +5192,25 @@
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_value_box",
-@@ -8377,179 +5013,82 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -8437,7 +8110,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Container::TAO_ClientRequestInfo_IR_Container_create_value_box ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- name,
-- version,
-- original_type_def,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
- (_tao_out << name) &&
- (_tao_out << version) &&
- (_tao_out << original_type_def)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_Container::TAO_ClientRequestInfo_IR_Container_create_value_box ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -8510,7 +8183,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_ValueBoxDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -8576,28 +8249,25 @@
return _tao_safe_retval._retn ();
}
@@ -9970,203 +5243,25 @@
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_exception",
-@@ -8558,158 +5097,64 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -8618,7 +8288,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Container::TAO_ClientRequestInfo_IR_Container_create_exception ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- name,
-- version,
-- members,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
- (_tao_out << name) &&
- (_tao_out << version) &&
- (_tao_out << members)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_Container::TAO_ClientRequestInfo_IR_Container_create_exception ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -8691,7 +8361,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_ExceptionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -8757,7 +8427,7 @@
return _tao_safe_retval._retn ();
}
@@ -10175,7 +5270,7 @@
CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
-@@ -8720,16 +5165,13 @@
+@@ -8768,16 +8438,13 @@
CORBA::SystemException
))
{
@@ -10194,205 +5289,25 @@
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_native",
-@@ -8738,152 +5180,59 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -8798,7 +8465,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Container::TAO_ClientRequestInfo_IR_Container_create_native ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- name,
-- version,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
- (_tao_out << name) &&
- (_tao_out << version)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_Container::TAO_ClientRequestInfo_IR_Container_create_native ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -8869,7 +8536,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
- return _tao_safe_retval._retn ();
- }
-
-@@ -8897,32 +5246,32 @@
++ IR_NativeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -8945,37 +8612,37 @@
// Remote & Base Proxy Broker Implementation
//
@@ -10406,10 +5321,16 @@
{
}
--// 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)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_Container_Remote_Proxy_Broker *
+-IR::_TAO_Container_Remote_Proxy_Broker::the_TAO_Container_Remote_Proxy_Broker (void)
++_TAO_Container_Remote_Proxy_Broker *
++_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;
@@ -10435,14 +5356,14 @@
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -8938,109 +5287,110 @@
+@@ -8991,109 +8658,109 @@
// default constructor
-IR::Container::Container (int collocated)
+IR_Container::IR_Container (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_Container_setup_collocation (collocated);
}
// destructor
@@ -10451,8 +5372,8 @@
{}
void
--IR::Container::_tao_setup_collocation (int collocated)
-+IR_Container::_tao_setup_collocation (int collocated)
+-IR::Container::IR_Container_setup_collocation (int collocated)
++IR_Container::IR_Container_setup_collocation (int collocated)
{
if (collocated)
this->the_TAO_Container_Proxy_Broker_ =
@@ -10461,11 +5382,9 @@
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 ();
-+
-+ CORBA_IRObject::_tao_setup_collocation (collocated);
++ _TAO_Container_Remote_Proxy_Broker::the_TAO_Container_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (CORBA, IRObject)::_tao_setup_collocation (collocated);
+ this->CORBA_IRObject_setup_collocation (collocated);
}
-void IR::Container::_tao_any_destructor (void *x)
@@ -10571,7 +5490,7 @@
{
if (
(!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
-@@ -9051,22 +5401,22 @@
+@@ -9104,22 +8771,22 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
@@ -10598,7 +5517,7 @@
this
)
);
-@@ -9079,20 +5429,19 @@
+@@ -9132,12 +8799,12 @@
return retv;
}
@@ -10613,16 +5532,7 @@
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,
-@@ -9100,8 +5449,8 @@
+@@ -9156,8 +8823,8 @@
);
}
@@ -10633,15 +5543,7 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -9109,7 +5458,6 @@
- CORBA::SystemException
- ))
- {
--
- return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).contents (
- this,
- limit_type,
-@@ -9118,10 +5466,10 @@
+@@ -9177,10 +8844,10 @@
);
}
@@ -10654,15 +5556,7 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -9129,7 +5477,6 @@
- CORBA::SystemException
- ))
- {
--
- return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).lookup_name (
- this,
- search_name,
-@@ -9151,7 +5498,7 @@
+@@ -9213,7 +8880,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
@@ -10671,7 +5565,7 @@
5, ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0), // name = kind
CORBA::tk_enum, // typecode kind
-@@ -9199,30 +5546,26 @@
+@@ -9261,30 +8928,26 @@
CORBA::tk_any,
};
@@ -10708,7 +5602,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp[i] = old[i];
-@@ -9235,75 +5578,66 @@
+@@ -9297,75 +8960,66 @@
}
void
@@ -10797,7 +5691,7 @@
static const CORBA::Long _oc_IR_Container_DescriptionSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -9323,7 +5657,7 @@
+@@ -9385,7 +9039,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
@@ -10806,7 +5700,7 @@
5, ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0), // name = kind
CORBA::tk_enum, // typecode kind
-@@ -9374,11 +5708,11 @@
+@@ -9436,11 +9090,11 @@
0U,
};
@@ -10822,15 +5716,7 @@
CORBA::Boolean exclude_inherited,
CORBA::Long max_returned_objs,
CORBA::Environment &ACE_TRY_ENV
-@@ -9387,7 +5721,6 @@
- CORBA::SystemException
- ))
- {
--
- return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).describe_contents (
- this,
- limit_type,
-@@ -9397,7 +5730,7 @@
+@@ -9462,7 +9116,7 @@
);
}
@@ -10839,15 +5725,7 @@
const char * id,
const char * name,
const char * version,
-@@ -9407,7 +5740,6 @@
- CORBA::SystemException
- ))
- {
--
- return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_module (
- this,
- id,
-@@ -9417,11 +5749,11 @@
+@@ -9485,11 +9139,11 @@
);
}
@@ -10861,15 +5739,7 @@
const CORBA::Any & value,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -9429,7 +5761,6 @@
- CORBA::SystemException
- ))
- {
--
- return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_constant (
- this,
- id,
-@@ -9441,18 +5772,17 @@
+@@ -9512,11 +9166,11 @@
);
}
@@ -10883,14 +5753,7 @@
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,
-@@ -9463,19 +5793,18 @@
+@@ -9537,12 +9191,12 @@
);
}
@@ -10906,14 +5769,7 @@
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,
-@@ -9487,18 +5816,17 @@
+@@ -9564,11 +9218,11 @@
);
}
@@ -10927,14 +5783,7 @@
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,
-@@ -9509,18 +5837,17 @@
+@@ -9589,11 +9243,11 @@
);
}
@@ -10948,14 +5797,7 @@
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,
-@@ -9531,11 +5858,11 @@
+@@ -9614,11 +9268,11 @@
);
}
@@ -10969,15 +5811,7 @@
CORBA::Boolean is_abstract,
CORBA::Boolean is_local,
CORBA::Environment &ACE_TRY_ENV
-@@ -9544,7 +5871,6 @@
- CORBA::SystemException
- ))
- {
--
- return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_interface (
- this,
- id,
-@@ -9557,24 +5883,23 @@
+@@ -9643,17 +9297,17 @@
);
}
@@ -11000,14 +5834,7 @@
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,
-@@ -9591,18 +5916,17 @@
+@@ -9680,11 +9334,11 @@
);
}
@@ -11021,14 +5848,7 @@
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,
-@@ -9613,18 +5937,17 @@
+@@ -9705,11 +9359,11 @@
);
}
@@ -11042,14 +5862,7 @@
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,
-@@ -9635,7 +5958,7 @@
+@@ -9730,7 +9384,7 @@
);
}
@@ -11058,2586 +5871,952 @@
const char * id,
const char * name,
const char * version,
-@@ -9645,7 +5968,6 @@
- CORBA::SystemException
- ))
- {
--
- return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_native (
- this,
- id,
-@@ -9655,1670 +5977,1156 @@
+@@ -9753,9 +9407,8 @@
);
}
-+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 = 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
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::Container::TAO_ClientRequestInfo_IR_Container_lookup::TAO_ClientRequestInfo_IR_Container_lookup (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * search_name,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- search_name_ (search_name)
-+///////////////////////////////////////////////////////////////////////
-+// Base & Remote Proxy Implementation.
-+//
-+
-+_TAO_IDLType_Proxy_Impl::_TAO_IDLType_Proxy_Impl (void)
++IR_Container::TAO_ClientRequestInfo_IR_Container_lookup::TAO_ClientRequestInfo_IR_Container_lookup (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * search_name,
+@@ -9766,7 +9419,7 @@
{}
--Dynamic::ParameterList *
+ Dynamic::ParameterList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_lookup::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_search_name = parameter_list->length ();
-- parameter_list->length (length_search_name + 1);
-- (*parameter_list)[length_search_name].argument <<= search_name_;
-- (*parameter_list)[length_search_name].mode = Dynamic::PARAM_IN;
-+_TAO_IDLType_Remote_Proxy_Impl::_TAO_IDLType_Remote_Proxy_Impl (void)
-+{}
-+
-+// 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);
-
-- return safe_parameter_list._retn ();
-+ 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 ()
-+ );
-+
-+ 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;
-+ }
-+
-+ return _tao_safe_retval._retn ();
++IR_Container::TAO_ClientRequestInfo_IR_Container_lookup::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -9785,7 +9438,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_lookup::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+
-+//
-+// End Base & Remote Proxy Implemeentation.
-+///////////////////////////////////////////////////////////////////////
-+
-+
-+///////////////////////////////////////////////////////////////////////
-+// Remote & Base Proxy Broker Implementation
-+//
-+
-+_TAO_IDLType_Proxy_Broker::_TAO_IDLType_Proxy_Broker (void)
++IR_Container::TAO_ClientRequestInfo_IR_Container_lookup::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
- }
+ // Generate the exception list on demand.
+@@ -9798,7 +9451,7 @@
-+_TAO_IDLType_Proxy_Broker::~_TAO_IDLType_Proxy_Broker (void)
-+{
-+}
--CORBA::Any *
+ CORBA::Any *
-IR::Container::TAO_ClientRequestInfo_IR_Container_lookup::result (CORBA::Environment &ACE_TRY_ENV)
-- 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.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
-+ static ::_TAO_IDLType_Remote_Proxy_Broker remote_proxy_broker;
-+ return &remote_proxy_broker;
++IR_Container::TAO_ClientRequestInfo_IR_Container_lookup::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -9814,16 +9467,16 @@
}
--void
+ void
-IR::Container::TAO_ClientRequestInfo_IR_Container_lookup::result (IR::Contained_ptr result)
-+_TAO_IDLType_Remote_Proxy_Broker::_TAO_IDLType_Remote_Proxy_Broker (void)
++IR_Container::TAO_ClientRequestInfo_IR_Container_lookup::result (IR_Contained_ptr result)
{
-- // update the result
-- this->_result = result;
+ // update the result
+ this->_result = result;
}
-IR::Container::TAO_ClientRequestInfo_IR_Container_contents::TAO_ClientRequestInfo_IR_Container_contents (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_Container::TAO_ClientRequestInfo_IR_Container_contents::TAO_ClientRequestInfo_IR_Container_contents (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- IR::DefinitionKind & limit_type,
-- const CORBA::Boolean & exclude_inherited,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- limit_type_ (limit_type),
-- exclude_inherited_ (exclude_inherited)
--{}
--
--Dynamic::ParameterList *
++ IR_DefinitionKind & limit_type,
+ const CORBA::Boolean & exclude_inherited,
+ CORBA::Environment &
+ )
+@@ -9833,7 +9486,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_contents::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+_TAO_IDLType_Remote_Proxy_Broker::~_TAO_IDLType_Remote_Proxy_Broker (void)
++IR_Container::TAO_ClientRequestInfo_IR_Container_contents::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_limit_type = parameter_list->length ();
-- parameter_list->length (length_limit_type + 1);
-- (*parameter_list)[length_limit_type].argument <<= this->limit_type_;
--
-- (*parameter_list)[length_limit_type].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_exclude_inherited = parameter_list->length ();
-- parameter_list->length (length_exclude_inherited + 1);
-- (*parameter_list)[length_exclude_inherited].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
-- (*parameter_list)[length_exclude_inherited].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
+ // Generate the argument list on demand.
+@@ -9858,7 +9511,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_contents::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+_TAO_IDLType_Proxy_Impl&
-+_TAO_IDLType_Remote_Proxy_Broker::select_proxy (
-+ ::IR_IDLType *object,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
++IR_Container::TAO_ClientRequestInfo_IR_Container_contents::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ ACE_UNUSED_ARG (object);
-+ ACE_UNUSED_ARG (ACE_TRY_ENV);
-+ return remote_proxy_impl_;
- }
+ // Generate the exception list on demand.
+@@ -9871,7 +9524,7 @@
--CORBA::Any *
+ CORBA::Any *
-IR::Container::TAO_ClientRequestInfo_IR_Container_contents::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
-+//
-+// End Remote & Base Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-+
++IR_Container::TAO_ClientRequestInfo_IR_Container_contents::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -9887,18 +9540,18 @@
+ }
--void
+ void
-IR::Container::TAO_ClientRequestInfo_IR_Container_contents::result (IR::ContainedSeq * result)
-+// default constructor
-+IR_IDLType::IR_IDLType (int collocated)
++IR_Container::TAO_ClientRequestInfo_IR_Container_contents::result (IR_ContainedSeq * result)
{
-- // update the result
-- this->_result = result;
-+ this->_tao_setup_collocation (collocated);
+ // update the result
+ this->_result = result;
}
-IR::Container::TAO_ClientRequestInfo_IR_Container_lookup_name::TAO_ClientRequestInfo_IR_Container_lookup_name (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * search_name,
-- const CORBA::Long & levels_to_search,
++IR_Container::TAO_ClientRequestInfo_IR_Container_lookup_name::TAO_ClientRequestInfo_IR_Container_lookup_name (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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_invocation, _tao_target),
-- search_name_ (search_name),
-- levels_to_search_ (levels_to_search),
-- limit_type_ (limit_type),
-- exclude_inherited_ (exclude_inherited)
-+// destructor
-+IR_IDLType::~IR_IDLType (void)
++ IR_DefinitionKind & limit_type,
+ const CORBA::Boolean & exclude_inherited,
+ CORBA::Environment &
+ )
+@@ -9910,7 +9563,7 @@
{}
--Dynamic::ParameterList *
+ Dynamic::ParameterList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_lookup_name::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void
-+IR_IDLType::_tao_setup_collocation (int collocated)
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_search_name = parameter_list->length ();
-- parameter_list->length (length_search_name + 1);
-- (*parameter_list)[length_search_name].argument <<= search_name_;
-- (*parameter_list)[length_search_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_levels_to_search = parameter_list->length ();
-- parameter_list->length (length_levels_to_search + 1);
-- (*parameter_list)[length_levels_to_search].argument <<= levels_to_search_;
-- (*parameter_list)[length_levels_to_search].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_limit_type = parameter_list->length ();
-- parameter_list->length (length_limit_type + 1);
-- (*parameter_list)[length_limit_type].argument <<= this->limit_type_;
--
-- (*parameter_list)[length_limit_type].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_exclude_inherited = parameter_list->length ();
-- parameter_list->length (length_exclude_inherited + 1);
-- (*parameter_list)[length_exclude_inherited].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
-- (*parameter_list)[length_exclude_inherited].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 ();
-
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_lookup_name::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ CORBA_IRObject::_tao_setup_collocation (collocated);
-
-- return exception_list;
++IR_Container::TAO_ClientRequestInfo_IR_Container_lookup_name::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -9945,7 +9598,7 @@
}
--
--CORBA::Any *
+ Dynamic::ExceptionList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_lookup_name::exceptions (CORBA::Environment &ACE_TRY_ENV)
++IR_Container::TAO_ClientRequestInfo_IR_Container_lookup_name::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -9958,7 +9611,7 @@
+
+
+ CORBA::Any *
-IR::Container::TAO_ClientRequestInfo_IR_Container_lookup_name::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void IR_IDLType::_tao_any_destructor (void *x)
++IR_Container::TAO_ClientRequestInfo_IR_Container_lookup_name::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
-+ IR_IDLType *tmp = ACE_static_cast (IR_IDLType*,x);
-+ CORBA::release (tmp);
+ // Generate the result on demand.
+@@ -9974,16 +9627,16 @@
}
--void
+ void
-IR::Container::TAO_ClientRequestInfo_IR_Container_lookup_name::result (IR::ContainedSeq * result)
-+IR_IDLType_ptr IR_IDLType::_narrow (
-+ CORBA::Object_ptr obj,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
++IR_Container::TAO_ClientRequestInfo_IR_Container_lookup_name::result (IR_ContainedSeq * result)
{
-- // update the result
-- this->_result = result;
-+ 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);
+ // update the result
+ this->_result = result;
}
-IR::Container::TAO_ClientRequestInfo_IR_Container_describe_contents::TAO_ClientRequestInfo_IR_Container_describe_contents (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_Container::TAO_ClientRequestInfo_IR_Container_describe_contents::TAO_ClientRequestInfo_IR_Container_describe_contents (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- IR::DefinitionKind & limit_type,
-- const CORBA::Boolean & exclude_inherited,
-- const CORBA::Long & max_returned_objs,
-- CORBA::Environment &
-+IR_IDLType_ptr IR_IDLType::_unchecked_narrow (
-+ CORBA::Object_ptr obj,
-+ CORBA::Environment &
- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- limit_type_ (limit_type),
-- exclude_inherited_ (exclude_inherited),
-- max_returned_objs_ (max_returned_objs)
--{}
--
--Dynamic::ParameterList *
++ IR_DefinitionKind & limit_type,
+ const CORBA::Boolean & exclude_inherited,
+ const CORBA::Long & max_returned_objs,
+ CORBA::Environment &
+@@ -9995,7 +9648,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_describe_contents::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
++IR_Container::TAO_ClientRequestInfo_IR_Container_describe_contents::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_limit_type = parameter_list->length ();
-- parameter_list->length (length_limit_type + 1);
-- (*parameter_list)[length_limit_type].argument <<= this->limit_type_;
--
-- (*parameter_list)[length_limit_type].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_exclude_inherited = parameter_list->length ();
-- parameter_list->length (length_exclude_inherited + 1);
-- (*parameter_list)[length_exclude_inherited].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
-- (*parameter_list)[length_exclude_inherited].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_max_returned_objs = parameter_list->length ();
-- parameter_list->length (length_max_returned_objs + 1);
-- (*parameter_list)[length_max_returned_objs].argument <<= max_returned_objs_;
-- (*parameter_list)[length_max_returned_objs].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+ 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 ();
+ // Generate the argument list on demand.
+@@ -10025,7 +9678,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_describe_contents::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ 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
-+ )
-+ )
-+ );
- }
++IR_Container::TAO_ClientRequestInfo_IR_Container_describe_contents::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -10038,7 +9691,7 @@
--
--CORBA::Any *
+
+ CORBA::Any *
-IR::Container::TAO_ClientRequestInfo_IR_Container_describe_contents::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR_IDLType_ptr
-+IR_IDLType::_duplicate (IR_IDLType_ptr obj)
++IR_Container::TAO_ClientRequestInfo_IR_Container_describe_contents::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
-+ if (!CORBA::is_nil (obj))
-+ obj->_add_ref ();
-+ return obj;
+ // Generate the result on demand.
+@@ -10054,13 +9707,13 @@
}
--void
+ void
-IR::Container::TAO_ClientRequestInfo_IR_Container_describe_contents::result (ACE_NESTED_CLASS (IR::Container,DescriptionSeq) * result)
-+CORBA::Boolean IR_IDLType::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++IR_Container::TAO_ClientRequestInfo_IR_Container_describe_contents::result (ACE_NESTED_CLASS (IR_Container,DescriptionSeq) * result)
{
-- // update the result
-- this->_result = result;
-+ 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);
+ // update the result
+ this->_result = result;
}
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_module::TAO_ClientRequestInfo_IR_Container_create_module (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version)
--{}
--
--Dynamic::ParameterList *
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_module::TAO_ClientRequestInfo_IR_Container_create_module (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * id,
+@@ -10075,7 +9728,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_module::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void *IR_IDLType::_tao_QueryInterface (ptr_arith_t type)
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_module::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-+ 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));
-
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
+ // Generate the argument list on demand.
+@@ -10104,7 +9757,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_module::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_module::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -10117,7 +9770,7 @@
+
+
+ CORBA::Any *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_module::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
-+ if (retv)
-+ this->_add_ref ();
-+ return retv;
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_module::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -10133,19 +9786,19 @@
}
--void
+ void
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_module::result (IR::ModuleDef_ptr result)
-+const char* IR_IDLType::_interface_repository_id (void) const
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_module::result (IR_ModuleDef_ptr result)
{
-- // update the result
-- this->_result = result;
-+ return "IDL:omg.org/IR/IDLType:1.0";
+ // update the result
+ this->_result = result;
}
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_constant::TAO_ClientRequestInfo_IR_Container_create_constant (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_constant::TAO_ClientRequestInfo_IR_Container_create_constant (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * id,
+ const char * name,
+ const char * version,
- IR::IDLType_ptr type,
-- const CORBA::Any & value,
-- CORBA::Environment &
-+CORBA::TypeCode_ptr IR_IDLType::type (
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_IDLType_ptr type,
+ const CORBA::Any & value,
+ CORBA::Environment &
)
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- type_ (type),
-- value_ (value)
--{}
--
--Dynamic::ParameterList *
+@@ -10158,7 +9811,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_constant::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_type = parameter_list->length ();
-- parameter_list->length (length_type + 1);
-- (*parameter_list)[length_type].argument <<= this->type_;
-
-- (*parameter_list)[length_type].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_value = parameter_list->length ();
-- parameter_list->length (length_value + 1);
-- (*parameter_list)[length_value].argument <<= value_;
-- (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ return this->the_TAO_IDLType_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type (
-+ this,
-+ ACE_TRY_ENV
-+ );
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_constant::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -10198,7 +9851,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_constant::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+static const CORBA::Long _oc_IR_IDLType[] =
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_constant::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
+ // Generate the exception list on demand.
+@@ -10211,7 +9864,7 @@
+
+
+ CORBA::Any *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_constant::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ 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 = 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)
-+TAO_NAMESPACE_END
-+static const CORBA::Long _oc_IR_PrimitiveKind[] =
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x72696d69), ACE_NTOHL (0x74697665), ACE_NTOHL (0x4b696e64), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/PrimitiveKind:1.0
-+ 14, ACE_NTOHL (0x5072696d), ACE_NTOHL (0x69746976), ACE_NTOHL (0x654b696e), ACE_NTOHL (0x64000000), // name = PrimitiveKind
-+ 22, // member count
-+ 8, ACE_NTOHL (0x706b5f6e), ACE_NTOHL (0x756c6c00), // name = pk_null
-+ 8, ACE_NTOHL (0x706b5f76), ACE_NTOHL (0x6f696400), // name = pk_void
-+ 9, ACE_NTOHL (0x706b5f73), ACE_NTOHL (0x686f7274), ACE_NTOHL (0x0), // name = pk_short
-+ 8, ACE_NTOHL (0x706b5f6c), ACE_NTOHL (0x6f6e6700), // name = pk_long
-+ 10, ACE_NTOHL (0x706b5f75), ACE_NTOHL (0x73686f72), ACE_NTOHL (0x74000000), // name = pk_ushort
-+ 9, ACE_NTOHL (0x706b5f75), ACE_NTOHL (0x6c6f6e67), ACE_NTOHL (0x0), // name = pk_ulong
-+ 9, ACE_NTOHL (0x706b5f66), ACE_NTOHL (0x6c6f6174), ACE_NTOHL (0x0), // name = pk_float
-+ 10, ACE_NTOHL (0x706b5f64), ACE_NTOHL (0x6f75626c), ACE_NTOHL (0x65000000), // name = pk_double
-+ 11, ACE_NTOHL (0x706b5f62), ACE_NTOHL (0x6f6f6c65), ACE_NTOHL (0x616e0000), // name = pk_boolean
-+ 8, ACE_NTOHL (0x706b5f63), ACE_NTOHL (0x68617200), // name = pk_char
-+ 9, ACE_NTOHL (0x706b5f6f), ACE_NTOHL (0x63746574), ACE_NTOHL (0x0), // name = pk_octet
-+ 7, ACE_NTOHL (0x706b5f61), ACE_NTOHL (0x6e790000), // name = pk_any
-+ 12, ACE_NTOHL (0x706b5f54), ACE_NTOHL (0x79706543), ACE_NTOHL (0x6f646500), // name = pk_TypeCode
-+ 13, ACE_NTOHL (0x706b5f50), ACE_NTOHL (0x72696e63), ACE_NTOHL (0x6970616c), ACE_NTOHL (0x0), // name = pk_Principal
-+ 10, ACE_NTOHL (0x706b5f73), ACE_NTOHL (0x7472696e), ACE_NTOHL (0x67000000), // name = pk_string
-+ 10, ACE_NTOHL (0x706b5f6f), ACE_NTOHL (0x626a7265), ACE_NTOHL (0x66000000), // name = pk_objref
-+ 12, ACE_NTOHL (0x706b5f6c), ACE_NTOHL (0x6f6e676c), ACE_NTOHL (0x6f6e6700), // name = pk_longlong
-+ 13, ACE_NTOHL (0x706b5f75), ACE_NTOHL (0x6c6f6e67), ACE_NTOHL (0x6c6f6e67), ACE_NTOHL (0x0), // name = pk_ulonglong
-+ 14, ACE_NTOHL (0x706b5f6c), ACE_NTOHL (0x6f6e6764), ACE_NTOHL (0x6f75626c), ACE_NTOHL (0x65000000), // name = pk_longdouble
-+ 9, ACE_NTOHL (0x706b5f77), ACE_NTOHL (0x63686172), ACE_NTOHL (0x0), // name = pk_wchar
-+ 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));
-+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
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_constant::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -10227,19 +9880,19 @@
+ }
--void
+ void
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_constant::result (IR::ConstantDef_ptr result)
--{
-- // update the result
-- this->_result = result;
--}
-+///////////////////////////////////////////////////////////////////////
-+// Base & Remote Proxy Implementation.
-+//
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_constant::result (IR_ConstantDef_ptr result)
+ {
+ // update the result
+ this->_result = result;
+ }
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_struct::TAO_ClientRequestInfo_IR_Container_create_struct (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_struct::TAO_ClientRequestInfo_IR_Container_create_struct (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * id,
+ const char * name,
+ const char * version,
- const IR::StructMemberSeq & members,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- members_ (members)
-+_TAO_Repository_Proxy_Impl::_TAO_Repository_Proxy_Impl (void)
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -10250,7 +9903,7 @@
{}
--Dynamic::ParameterList *
+ Dynamic::ParameterList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_struct::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_members = parameter_list->length ();
-- parameter_list->length (length_members + 1);
-- (*parameter_list)[length_members].argument <<= this->members_;
--
-- (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_struct::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -10285,7 +9938,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_struct::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+_TAO_Repository_Remote_Proxy_Impl::_TAO_Repository_Remote_Proxy_Impl (void)
-+{}
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_struct::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -10298,7 +9951,7 @@
-+// Remote Implementation of the IDL interface methods
--CORBA::Any *
+ CORBA::Any *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_struct::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR_Contained_ptr _TAO_Repository_Remote_Proxy_Impl::lookup_id (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * search_id,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ IR_Contained_ptr _tao_retval = IR_Contained::_nil ();
-+ IR_Contained_var _tao_safe_retval (_tao_retval);
-
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_struct::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -10314,20 +9967,20 @@
+ }
+
+ void
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_struct::result (IR::StructDef_ptr result)
--{
-- // update the result
-- this->_result = result;
--}
-+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_union::TAO_ClientRequestInfo_IR_Container_create_union (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- discriminator_type_ (discriminator_type),
-- members_ (members)
--{}
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "lookup_id",
-+ 9,
-+ 1,
-+ istub->orb_core ()
-+ );
-
--Dynamic::ParameterList *
++ IR_IDLType_ptr discriminator_type,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -10339,7 +9992,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_union::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_discriminator_type = parameter_list->length ();
-- parameter_list->length (length_discriminator_type + 1);
-- (*parameter_list)[length_discriminator_type].argument <<= this->discriminator_type_;
--
-- (*parameter_list)[length_discriminator_type].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_members = parameter_list->length ();
-- parameter_list->length (length_members + 1);
-- (*parameter_list)[length_members].argument <<= this->members_;
--
-- (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << search_id)
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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;
-+ }
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_union::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -10380,7 +10033,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_union::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ return _tao_safe_retval._retn ();
- }
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_union::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -10393,7 +10046,7 @@
--
--CORBA::Any *
+
+ CORBA::Any *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_union::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+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
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
-+ CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
-+ CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
-+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
--void
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_union::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -10409,19 +10062,19 @@
+ }
+
+ void
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_union::result (IR::UnionDef_ptr result)
--{
-- // update the result
-- this->_result = result;
--}
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "get_canonical_typecode",
-+ 22,
-+ 1,
-+ istub->orb_core ()
-+ );
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_enum::TAO_ClientRequestInfo_IR_Container_create_enum (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * id,
+ const char * name,
+ const char * version,
- const IR::EnumMemberSeq & members,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- members_ (members)
--{}
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << tc)
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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;
-+ }
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -10432,7 +10085,7 @@
+ {}
--Dynamic::ParameterList *
+ Dynamic::ParameterList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_enum::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_members = parameter_list->length ();
-- parameter_list->length (length_members + 1);
-- (*parameter_list)[length_members].argument <<= this->members_;
--
-- (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ return _tao_safe_retval._retn ();
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_enum::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -10467,7 +10120,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_enum::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+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
-+ ))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ IR_PrimitiveDef_ptr _tao_retval = IR_PrimitiveDef::_nil ();
-+ IR_PrimitiveDef_var _tao_safe_retval (_tao_retval);
-
-- return exception_list;
--}
-+ 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",
-+ 13,
-+ 1,
-+ istub->orb_core ()
-+ );
-
--CORBA::Any *
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_enum::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -10480,7 +10133,7 @@
+
+
+ CORBA::Any *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_enum::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << kind)
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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;
-+ }
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_enum::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -10496,19 +10149,19 @@
+ }
--void
+ void
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_enum::result (IR::EnumDef_ptr result)
--{
-- // update the result
-- this->_result = result;
-+ return _tao_safe_retval._retn ();
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_alias::TAO_ClientRequestInfo_IR_Container_create_alias (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * id,
+ const char * name,
+ const char * version,
- IR::IDLType_ptr original_type,
-- CORBA::Environment &
-+IR_StringDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_string (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::ULong bound,
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_IDLType_ptr original_type,
+ CORBA::Environment &
)
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- original_type_ (original_type)
--{}
--
--Dynamic::ParameterList *
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -10519,7 +10172,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_alias::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_original_type = parameter_list->length ();
-- parameter_list->length (length_original_type + 1);
-- (*parameter_list)[length_original_type].argument <<= this->original_type_;
-+ IR_StringDef_ptr _tao_retval = IR_StringDef::_nil ();
-+ IR_StringDef_var _tao_safe_retval (_tao_retval);
-
-- (*parameter_list)[length_original_type].mode = Dynamic::PARAM_IN;
-+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-- return safe_parameter_list._retn ();
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "create_string",
-+ 13,
-+ 1,
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << bound)
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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;
-+ }
-+
-+ return _tao_safe_retval._retn ();
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_alias::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -10554,7 +10207,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_alias::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR_WstringDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_wstring (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::ULong bound,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ IR_WstringDef_ptr _tao_retval = IR_WstringDef::_nil ();
-+ IR_WstringDef_var _tao_safe_retval (_tao_retval);
-
-- return exception_list;
--}
-+ 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",
-+ 14,
-+ 1,
-+ istub->orb_core ()
-+ );
-
--CORBA::Any *
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_alias::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -10567,7 +10220,7 @@
+
+
+ CORBA::Any *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_alias::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << bound)
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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;
-+ }
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_alias::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -10583,19 +10236,19 @@
+ }
--void
+ void
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_alias::result (IR::AliasDef_ptr result)
--{
-- // update the result
-- this->_result = result;
-+ return _tao_safe_retval._retn ();
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_interface::TAO_ClientRequestInfo_IR_Container_create_interface (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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 &
-+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
- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- base_interfaces_ (base_interfaces),
-- is_abstract_ (is_abstract),
-- is_local_ (is_local)
--{}
--
--Dynamic::ParameterList *
++ const IR_InterfaceDefSeq & base_interfaces,
+ const CORBA::Boolean & is_abstract,
+ const CORBA::Boolean & is_local,
+ CORBA::Environment &
+@@ -10610,7 +10263,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_base_interfaces = parameter_list->length ();
-- parameter_list->length (length_base_interfaces + 1);
-- (*parameter_list)[length_base_interfaces].argument <<= this->base_interfaces_;
-+ IR_SequenceDef_ptr _tao_retval = IR_SequenceDef::_nil ();
-+ IR_SequenceDef_var _tao_safe_retval (_tao_retval);
-
-- (*parameter_list)[length_base_interfaces].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_is_abstract = parameter_list->length ();
-- parameter_list->length (length_is_abstract + 1);
-- (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
-- (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_is_local = parameter_list->length ();
-- parameter_list->length (length_is_local + 1);
-- (*parameter_list)[length_is_local].argument <<= CORBA::Any::from_boolean (this->is_local_);
-- (*parameter_list)[length_is_local].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -10655,7 +10308,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ 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",
-+ 15,
-+ 1,
-+ istub->orb_core ()
-+ );
-
--CORBA::Any *
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -10668,7 +10321,7 @@
+
+
+ CORBA::Any *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_interface::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << bound) &&
-+ (_tao_out << element_type)
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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;
-+ }
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_interface::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -10684,13 +10337,13 @@
+ }
--void
+ void
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_interface::result (IR::InterfaceDef_ptr result)
--{
-- // update the result
-- this->_result = result;
-+ return _tao_safe_retval._retn ();
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
-- const CORBA::Boolean & is_custom,
-- const CORBA::Boolean & is_abstract,
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_value::TAO_ClientRequestInfo_IR_Container_create_value (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * id,
+@@ -10698,11 +10351,11 @@
+ const char * version,
+ const CORBA::Boolean & is_custom,
+ const CORBA::Boolean & is_abstract,
- IR::ValueDef_ptr base_value,
-- const CORBA::Boolean & is_truncatable,
++ 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 &
-+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
++ const IR_ValueDefSeq & abstract_base_values,
++ const IR_InterfaceDefSeq & supported_interfaces,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &
)
-- : TAO_ClientRequestInfo (_tao_invocation, _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 *
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -10719,7 +10372,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_value::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_is_custom = parameter_list->length ();
-- parameter_list->length (length_is_custom + 1);
-- (*parameter_list)[length_is_custom].argument <<= CORBA::Any::from_boolean (this->is_custom_);
-- (*parameter_list)[length_is_custom].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_is_abstract = parameter_list->length ();
-- parameter_list->length (length_is_abstract + 1);
-- (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
-- (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_base_value = parameter_list->length ();
-- parameter_list->length (length_base_value + 1);
-- (*parameter_list)[length_base_value].argument <<= this->base_value_;
--
-- (*parameter_list)[length_base_value].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_is_truncatable = parameter_list->length ();
-- parameter_list->length (length_is_truncatable + 1);
-- (*parameter_list)[length_is_truncatable].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
-- (*parameter_list)[length_is_truncatable].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_abstract_base_values = parameter_list->length ();
-- parameter_list->length (length_abstract_base_values + 1);
-- (*parameter_list)[length_abstract_base_values].argument <<= this->abstract_base_values_;
--
-- (*parameter_list)[length_abstract_base_values].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_supported_interfaces = parameter_list->length ();
-- parameter_list->length (length_supported_interfaces + 1);
-- (*parameter_list)[length_supported_interfaces].argument <<= this->supported_interfaces_;
--
-- (*parameter_list)[length_supported_interfaces].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_initializers = parameter_list->length ();
-- parameter_list->length (length_initializers + 1);
-- (*parameter_list)[length_initializers].argument <<= this->initializers_;
--
-- (*parameter_list)[length_initializers].mode = Dynamic::PARAM_IN;
-+ IR_ArrayDef_ptr _tao_retval = IR_ArrayDef::_nil ();
-+ IR_ArrayDef_var _tao_safe_retval (_tao_retval);
-
-- return safe_parameter_list._retn ();
-+ 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 ()
-+ );
-+
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << length) &&
-+ (_tao_out << element_type)
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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;
-+ }
-+
-+ return _tao_safe_retval._retn ();
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_value::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -10787,7 +10440,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_value::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+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
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ IR_FixedDef_ptr _tao_retval = IR_FixedDef::_nil ();
-+ IR_FixedDef_var _tao_safe_retval (_tao_retval);
-
-- return exception_list;
--}
-+ 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",
-+ 12,
-+ 1,
-+ istub->orb_core ()
-+ );
-
--CORBA::Any *
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_value::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -10800,7 +10453,7 @@
+
+
+ CORBA::Any *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_value::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << digits) &&
-+ (_tao_out << scale)
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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;
-+ }
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_value::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -10816,19 +10469,19 @@
+ }
--void
+ void
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_value::result (IR::ValueDef_ptr result)
--{
-- // update the result
-- this->_result = result;
-+ return _tao_safe_retval._retn ();
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_value_box::TAO_ClientRequestInfo_IR_Container_create_value_box (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * id,
+ const char * name,
+ const char * version,
- IR::IDLType_ptr original_type_def,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- original_type_def_ (original_type_def)
--{}
-
--Dynamic::ParameterList *
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -10839,7 +10492,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_value_box::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_original_type_def = parameter_list->length ();
-- parameter_list->length (length_original_type_def + 1);
-- (*parameter_list)[length_original_type_def].argument <<= this->original_type_def_;
--
-- (*parameter_list)[length_original_type_def].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+//
-+// End Base & Remote Proxy Implemeentation.
-+///////////////////////////////////////////////////////////////////////
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_value_box::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -10874,7 +10527,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_value_box::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_value_box::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -10887,7 +10540,7 @@
-+///////////////////////////////////////////////////////////////////////
-+// Remote & Base Proxy Broker Implementation
-+//
--CORBA::Any *
+ CORBA::Any *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_value_box::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+_TAO_Repository_Proxy_Broker::_TAO_Repository_Proxy_Broker (void)
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_value_box::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
+ // Generate the result on demand.
+@@ -10903,19 +10556,19 @@
}
--void
+ void
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_value_box::result (IR::ValueBoxDef_ptr result)
-+_TAO_Repository_Proxy_Broker::~_TAO_Repository_Proxy_Broker (void)
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_value_box::result (IR_ValueBoxDef_ptr result)
{
-- // update the result
-- this->_result = result;
+ // update the result
+ this->_result = result;
}
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_exception::TAO_ClientRequestInfo_IR_Container_create_exception (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_exception::TAO_ClientRequestInfo_IR_Container_create_exception (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * id,
+ const char * name,
+ const char * version,
- const IR::StructMemberSeq & members,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- members_ (members)
--{}
--
--Dynamic::ParameterList *
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -10926,7 +10579,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_exception::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+// Factory function Implementation.
-+_TAO_Repository_Remote_Proxy_Broker *the_TAO_Repository_Remote_Proxy_Broker (void)
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_members = parameter_list->length ();
-- parameter_list->length (length_members + 1);
-- (*parameter_list)[length_members].argument <<= this->members_;
--
-- (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ static ::_TAO_Repository_Remote_Proxy_Broker remote_proxy_broker;
-+ return &remote_proxy_broker;
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_exception::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -10961,7 +10614,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_exception::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+_TAO_Repository_Remote_Proxy_Broker::_TAO_Repository_Remote_Proxy_Broker (void)
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_exception::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
- }
+ // Generate the exception list on demand.
+@@ -10974,7 +10627,7 @@
--
--CORBA::Any *
+
+ CORBA::Any *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_exception::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+_TAO_Repository_Remote_Proxy_Broker::~_TAO_Repository_Remote_Proxy_Broker (void)
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_exception::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
+ // Generate the result on demand.
+@@ -10990,13 +10643,13 @@
}
--void
+ void
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_exception::result (IR::ExceptionDef_ptr result)
-+_TAO_Repository_Proxy_Impl&
-+_TAO_Repository_Remote_Proxy_Broker::select_proxy (
-+ ::IR_Repository *object,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_exception::result (IR_ExceptionDef_ptr result)
{
-- // update the result
-- this->_result = result;
-+ ACE_UNUSED_ARG (object);
-+ ACE_UNUSED_ARG (ACE_TRY_ENV);
-+ return remote_proxy_impl_;
+ // update the result
+ this->_result = result;
}
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_native::TAO_ClientRequestInfo_IR_Container_create_native (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version)
--{}
-
--Dynamic::ParameterList *
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_native::TAO_ClientRequestInfo_IR_Container_create_native (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * id,
+@@ -11011,7 +10664,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_native::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+//
-+// End Remote & Base Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_native::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -11040,7 +10693,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_native::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+
-+// default constructor
-+IR_Repository::IR_Repository (int collocated)
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_native::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ this->_tao_setup_collocation (collocated);
- }
+ // Generate the exception list on demand.
+@@ -11053,7 +10706,7 @@
-+// destructor
-+IR_Repository::~IR_Repository (void)
-+{}
--CORBA::Any *
+ CORBA::Any *
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_native::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void
-+IR_Repository::_tao_setup_collocation (int collocated)
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_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 ();
-
-- CORBA::Any_var safe_result_any = result_any;
-+ IR_Container::_tao_setup_collocation (collocated);
-
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_native::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -11069,20 +10722,21 @@
}
--void
+ void
-IR::Container::TAO_ClientRequestInfo_IR_Container_create_native::result (IR::NativeDef_ptr result)
-+void IR_Repository::_tao_any_destructor (void *x)
++IR_Container::TAO_ClientRequestInfo_IR_Container_create_native::result (IR_NativeDef_ptr result)
{
-- // update the result
-- this->_result = result;
-+ IR_Repository *tmp = ACE_static_cast (IR_Repository*,x);
-+ CORBA::release (tmp);
+ // update the result
+ this->_result = result;
}
--#endif /* TAO_HAS_INTERCEPTORS */
--static const CORBA::Long _oc_IR_Container[] =
-+IR_Repository_ptr IR_Repository::_narrow (
-+ CORBA::Object_ptr obj,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
+ #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
+ 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
--};
++ 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
--
--///////////////////////////////////////////////////////////////////////
--// Base & Remote Proxy Implementation.
--//
--
++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)
+@@ -11092,15 +10746,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
-IR::_TAO_IDLType_Proxy_Impl::_TAO_IDLType_Proxy_Impl (void)
--{}
--
++_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
-+ if (CORBA::is_nil (obj))
-+ 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 (IR_Repository::_nil ());
-+ if (is_a == 0)
-+ return IR_Repository::_nil ();
-+ }
-+ return IR_Repository::_unchecked_narrow (obj, ACE_TRY_ENV);
-+}
++_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);
--
++CORBA::TypeCode_ptr _TAO_IDLType_Remote_Proxy_Impl::type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -11108,16 +10762,13 @@
+ CORBA::SystemException
+ ))
+ {
-
-- 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 ()
-- );
+ CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
+ CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
+
-
--#endif /* TAO_HAS_INTERCEPTORS */
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_type",
+@@ -11138,7 +10789,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
--
--
--//
--// End Base & Remote Proxy Implemeentation.
--///////////////////////////////////////////////////////////////////////
--
--
--///////////////////////////////////////////////////////////////////////
--// Remote & Base Proxy Broker Implementation
--//
--
++ IR_IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -11270,37 +10921,37 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
-IR::_TAO_IDLType_Proxy_Broker::_TAO_IDLType_Proxy_Broker (void)
--{
--}
--
++_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)
--{
++_TAO_IDLType_Proxy_Broker::~_TAO_IDLType_Proxy_Broker (void)
+ {
+ }
+
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_IDLType_Remote_Proxy_Broker *
+-IR::_TAO_IDLType_Remote_Proxy_Broker::the_TAO_IDLType_Remote_Proxy_Broker (void)
++_TAO_IDLType_Remote_Proxy_Broker *
++_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;
--}
--
++ static ::_TAO_IDLType_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
-IR::_TAO_IDLType_Remote_Proxy_Broker::_TAO_IDLType_Remote_Proxy_Broker (void)
--{
--}
--
++_TAO_IDLType_Remote_Proxy_Broker::_TAO_IDLType_Remote_Proxy_Broker (void)
+ {
+ }
+
-IR::_TAO_IDLType_Remote_Proxy_Broker::~_TAO_IDLType_Remote_Proxy_Broker (void)
--{
--}
--
++_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
++_TAO_IDLType_Proxy_Impl&
++_TAO_IDLType_Remote_Proxy_Broker::select_proxy (
++ ::IR_IDLType *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -11316,109 +10967,109 @@
+
+
+ // default constructor
-IR::IDLType::IDLType (int collocated)
--{
-- this->_tao_setup_collocation (collocated);
--}
--
--// destructor
++IR_IDLType::IR_IDLType (int collocated)
+ {
+ this->IR_IDLType_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_IDLType::~IR_IDLType (void)
+ {}
+
+ void
+-IR::IDLType::IR_IDLType_setup_collocation (int collocated)
++IR_IDLType::IR_IDLType_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_ =
++ _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);
--}
--
++ ::_TAO_IDLType_Remote_Proxy_Broker::the_TAO_IDLType_Remote_Proxy_Broker ();
+
+ this->CORBA_IRObject_setup_collocation (collocated);
+ }
+
-void IR::IDLType::_tao_any_destructor (void *x)
--{
++void IR_IDLType::_tao_any_destructor (void *x)
+ {
- IDLType *tmp = ACE_static_cast (IDLType*,x);
-- CORBA::release (tmp);
--}
--
++ 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))
++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);
++ 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 (IDLType::_nil ());
-- if (is_a == 0)
++ ACE_CHECK_RETURN (IR_IDLType::_nil ());
+ if (is_a == 0)
- return IDLType::_nil ();
-- }
++ return IR_IDLType::_nil ();
+ }
- return IDLType::_unchecked_narrow (obj, ACE_TRY_ENV);
--}
--
++ return IR_IDLType::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
-IR::IDLType_ptr IR::IDLType::_unchecked_narrow (
-- CORBA::Object_ptr obj,
-- CORBA::Environment &
-+IR_Repository_ptr IR_Repository::_unchecked_narrow (
-+ CORBA::Object_ptr obj,
-+ CORBA::Environment &
++IR_IDLType_ptr IR_IDLType::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
)
{
if (CORBA::is_nil (obj))
- return IDLType::_nil ();
-+ return IR_Repository::_nil ();
++ return IR_IDLType::_nil ();
if (! obj->_is_local ())
{
TAO_Stub* stub = obj->_stubobj ();
if (stub)
stub->_incr_refcnt ();
- IDLType_ptr default_proxy = IDLType::_nil ();
-+ IR_Repository_ptr default_proxy = IR_Repository::_nil ();
++ 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 () &&IR__TAO_IDLType_Proxy_Broker_Factory_function_pointer != 0
-+ obj->_is_collocated () &&_TAO_Repository_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_IDLType_Proxy_Broker_Factory_function_pointer != 0
)
{
ACE_NEW_RETURN (
default_proxy,
- ::IR::IDLType (
-+ ::IR_Repository (
++ ::IR_IDLType (
stub,
1,
obj->_servant ()),
- IDLType::_nil ());
-+ IR_Repository::_nil ());
++ IR_IDLType::_nil ());
}
if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, ::IR::IDLType (stub, 0, obj->_servant ()), IDLType::_nil ());
-+ ACE_NEW_RETURN (default_proxy, ::IR_Repository (stub, 0, obj->_servant ()), IR_Repository::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_IDLType (stub, 0, obj->_servant ()), IR_IDLType::_nil ());
return default_proxy;
}
else
@@ -13645,14 +6824,14 @@
ACE_reinterpret_cast
(
- IDLType_ptr,
-+ IR_Repository_ptr,
++ IR_IDLType_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &IDLType::_narrow
-+ &IR_Repository::_narrow
++ &IR_IDLType::_narrow
)
)
);
@@ -13660,8 +6839,8 @@
-IR::IDLType_ptr
-IR::IDLType::_duplicate (IDLType_ptr obj)
-+IR_Repository_ptr
-+IR_Repository::_duplicate (IR_Repository_ptr obj)
++IR_IDLType_ptr
++IR_IDLType::_duplicate (IR_IDLType_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -13669,43 +6848,26 @@
}
-CORBA::Boolean IR::IDLType::_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)
++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/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
-@@ -11326,22 +7134,34 @@
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
+@@ -11429,22 +11080,22 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::IDLType::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_Repository::_tao_QueryInterface (ptr_arith_t type)
++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))
-+ &IR_Repository::_narrow))
++ &IR_IDLType::_narrow))
retv = ACE_reinterpret_cast (void*, this);
else if (type == ACE_reinterpret_cast
(ptr_arith_t,
- &::CORBA::IRObject::_narrow))
-+ &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
(
@@ -13717,266 +6879,113 @@
this
)
);
-@@ -11354,1570 +7174,378 @@
+@@ -11457,12 +11108,12 @@
return retv;
}
-const char* IR::IDLType::_interface_repository_id (void) const
-+const char* IR_Repository::_interface_repository_id (void) const
++const char* IR_IDLType::_interface_repository_id (void) const
{
-- return "IDL:omg.org/IR/IDLType:1.0";
-+ return "IDL:omg.org/IR/Repository:1.0";
+ return "IDL:omg.org/IR/IDLType:1.0";
}
-CORBA::TypeCode_ptr IR::IDLType::type (
-+IR_Contained_ptr IR_Repository::lookup_id (
-+ const char * search_id,
++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 (
-+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).lookup_id (
- this,
-+ search_id,
- ACE_TRY_ENV
+@@ -11479,9 +11130,8 @@
);
}
-+CORBA::TypeCode_ptr IR_Repository::get_canonical_typecode (
-+ CORBA::TypeCode_ptr tc,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).get_canonical_typecode (
-+ this,
-+ tc,
-+ ACE_TRY_ENV
-+ );
-+}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::TAO_ClientRequestInfo_IR_IDLType_type_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-+IR_PrimitiveDef_ptr IR_Repository::get_primitive (
-+ IR_PrimitiveKind kind,
-+ CORBA::Environment &ACE_TRY_ENV
- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).get_primitive (
-+ this,
-+ kind,
-+ ACE_TRY_ENV
-+ );
-+}
-
--Dynamic::ParameterList *
++IR_IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::TAO_ClientRequestInfo_IR_IDLType_type_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -11490,7 +11140,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR_StringDef_ptr IR_Repository::create_string (
-+ CORBA::ULong bound,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
-+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_string (
-+ this,
-+ bound,
-+ ACE_TRY_ENV
-+ );
++IR_IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -11502,7 +11152,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR_WstringDef_ptr IR_Repository::create_wstring (
-+ CORBA::ULong bound,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_wstring (
-+ this,
-+ bound,
-+ ACE_TRY_ENV
-+ );
- }
++IR_IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -11515,7 +11165,7 @@
-+IR_SequenceDef_ptr IR_Repository::create_sequence (
-+ CORBA::ULong bound,
-+ 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,
-+ element_type,
-+ ACE_TRY_ENV
-+ );
-+}
-
--CORBA::Any *
+
+ CORBA::Any *
-IR::IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR_ArrayDef_ptr IR_Repository::create_array (
-+ CORBA::ULong length,
-+ IR_IDLType_ptr element_type,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
-+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_array (
-+ this,
-+ length,
-+ element_type,
-+ ACE_TRY_ENV
-+ );
++IR_IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -11531,20 +11181,21 @@
}
--void
+ void
-IR::IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::result (CORBA::TypeCode_ptr result)
-+IR_FixedDef_ptr IR_Repository::create_fixed (
-+ CORBA::UShort digits,
-+ CORBA::Short scale,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // update the result
-- this->_result = result;
-+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_fixed (
-+ this,
-+ digits,
-+ scale,
-+ ACE_TRY_ENV
-+ );
++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[] =
-+static const CORBA::Long _oc_IR_Repository[] =
+ #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
+ 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
-+ 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 = IR_Repository
++ 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_Repository (CORBA::tk_objref, sizeof (_oc_IR_Repository), (char *) &_oc_IR_Repository, 0, sizeof (IR_Repository));
++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)
--TAO_NAMESPACE_END
--static const CORBA::Long _oc_IR_PrimitiveKind[] =
--{
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x72696d69), ACE_NTOHL (0x74697665), ACE_NTOHL (0x4b696e64), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/PrimitiveKind:1.0
-- 14, ACE_NTOHL (0x5072696d), ACE_NTOHL (0x69746976), ACE_NTOHL (0x654b696e), ACE_NTOHL (0x64000000), // name = PrimitiveKind
-- 22, // member count
-- 8, ACE_NTOHL (0x706b5f6e), ACE_NTOHL (0x756c6c00), // name = pk_null
-- 8, ACE_NTOHL (0x706b5f76), ACE_NTOHL (0x6f696400), // name = pk_void
-- 9, ACE_NTOHL (0x706b5f73), ACE_NTOHL (0x686f7274), ACE_NTOHL (0x0), // name = pk_short
-- 8, ACE_NTOHL (0x706b5f6c), ACE_NTOHL (0x6f6e6700), // name = pk_long
-- 10, ACE_NTOHL (0x706b5f75), ACE_NTOHL (0x73686f72), ACE_NTOHL (0x74000000), // name = pk_ushort
-- 9, ACE_NTOHL (0x706b5f75), ACE_NTOHL (0x6c6f6e67), ACE_NTOHL (0x0), // name = pk_ulong
-- 9, ACE_NTOHL (0x706b5f66), ACE_NTOHL (0x6c6f6174), ACE_NTOHL (0x0), // name = pk_float
-- 10, ACE_NTOHL (0x706b5f64), ACE_NTOHL (0x6f75626c), ACE_NTOHL (0x65000000), // name = pk_double
-- 11, ACE_NTOHL (0x706b5f62), ACE_NTOHL (0x6f6f6c65), ACE_NTOHL (0x616e0000), // name = pk_boolean
-- 8, ACE_NTOHL (0x706b5f63), ACE_NTOHL (0x68617200), // name = pk_char
-- 9, ACE_NTOHL (0x706b5f6f), ACE_NTOHL (0x63746574), ACE_NTOHL (0x0), // name = pk_octet
-- 7, ACE_NTOHL (0x706b5f61), ACE_NTOHL (0x6e790000), // name = pk_any
-- 12, ACE_NTOHL (0x706b5f54), ACE_NTOHL (0x79706543), ACE_NTOHL (0x6f646500), // name = pk_TypeCode
-- 13, ACE_NTOHL (0x706b5f50), ACE_NTOHL (0x72696e63), ACE_NTOHL (0x6970616c), ACE_NTOHL (0x0), // name = pk_Principal
-- 10, ACE_NTOHL (0x706b5f73), ACE_NTOHL (0x7472696e), ACE_NTOHL (0x67000000), // name = pk_string
-- 10, ACE_NTOHL (0x706b5f6f), ACE_NTOHL (0x626a7265), ACE_NTOHL (0x66000000), // name = pk_objref
-- 12, ACE_NTOHL (0x706b5f6c), ACE_NTOHL (0x6f6e676c), ACE_NTOHL (0x6f6e6700), // name = pk_longlong
-- 13, ACE_NTOHL (0x706b5f75), ACE_NTOHL (0x6c6f6e67), ACE_NTOHL (0x6c6f6e67), ACE_NTOHL (0x0), // name = pk_ulonglong
-- 14, ACE_NTOHL (0x706b5f6c), ACE_NTOHL (0x6f6e6764), ACE_NTOHL (0x6f75626c), ACE_NTOHL (0x65000000), // name = pk_longdouble
-- 9, ACE_NTOHL (0x706b5f77), ACE_NTOHL (0x63686172), ACE_NTOHL (0x0), // name = pk_wchar
-- 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
--};
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IDLType, &_tc_TAO_tc_IR_IDLType)
+@@ -11578,7 +11229,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));
--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_DEFINE (CORBA::TypeCode_ptr, _tc_Repository, &_tc_TAO_tc_IR_Repository)
- TAO_NAMESPACE_END
-
- ///////////////////////////////////////////////////////////////////////
++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)
+@@ -11588,15 +11239,15 @@
// Base & Remote Proxy Implementation.
//
-IR::_TAO_Repository_Proxy_Impl::_TAO_Repository_Proxy_Impl (void)
-+_TAO_ComponentRepository_Proxy_Impl::_TAO_ComponentRepository_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_ComponentRepository_Remote_Proxy_Impl::_TAO_ComponentRepository_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_ComponentDef_ptr _TAO_ComponentRepository_Remote_Proxy_Impl::create_component (
++IR_Contained_ptr _TAO_Repository_Remote_Proxy_Impl::lookup_id (
CORBA_Object *_collocated_tao_target_,
-- const char * search_id,
-+ const char * id,
-+ const char * name,
-+ const char * version,
-+ IR_ComponentDef_ptr base_component,
-+ const IR_InterfaceDefSeq & supports_interfaces,
+ const char * search_id,
CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
+@@ -11605,16 +11256,13 @@
CORBA::SystemException
))
{
@@ -13984,240 +6993,53 @@
- IR::Contained_ptr _tao_retval = IR::Contained::_nil ();
- IR::Contained_var _tao_safe_retval (_tao_retval);
-
-+ IR_ComponentDef_ptr _tao_retval = IR_ComponentDef::_nil ();
-+ IR_ComponentDef_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",
-- 9,
-+ "create_component",
-+ 16,
- 1,
- istub->orb_core ()
- );
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
-+ (_tao_out << name) &&
-+ (_tao_out << version) &&
-+ (_tao_out << base_component) &&
-+ (_tao_out << supports_interfaces)
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 0
-+ );
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "lookup_id",
+@@ -11635,7 +11283,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
--#if TAO_HAS_INTERCEPTORS == 1
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- search_id,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << search_id)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ search_id,
+@@ -11702,7 +11350,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_Contained_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -11768,7 +11416,7 @@
return _tao_safe_retval._retn ();
}
-CORBA::TypeCode_ptr IR::_TAO_Repository_Remote_Proxy_Impl::get_canonical_typecode (
-+IR_HomeDef_ptr _TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
++CORBA::TypeCode_ptr _TAO_Repository_Remote_Proxy_Impl::get_canonical_typecode (
CORBA_Object *_collocated_tao_target_,
-- CORBA::TypeCode_ptr tc,
-+ 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::TypeCode_ptr tc,
CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
+@@ -11777,16 +11425,13 @@
CORBA::SystemException
))
{
-
-- CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
-- CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
--
-+ IR_HomeDef_ptr _tao_retval = IR_HomeDef::_nil ();
-+ IR_HomeDef_var _tao_safe_retval (_tao_retval);
+ 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);
@@ -14225,1430 +7047,448 @@
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
-- "get_canonical_typecode",
-- 22,
-+ "create_home",
-+ 11,
- 1,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
-+ (_tao_out << name) &&
-+ (_tao_out << version) &&
-+ (_tao_out << base_home) &&
-+ (_tao_out << managed_component) &&
-+ (_tao_out << primary_key)
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 0
-+ );
+ "get_canonical_typecode",
+@@ -11807,7 +11452,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
--#if TAO_HAS_INTERCEPTORS == 1
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- tc,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << tc)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ tc,
+@@ -11940,25 +11585,22 @@
return _tao_safe_retval._retn ();
}
-IR::PrimitiveDef_ptr IR::_TAO_Repository_Remote_Proxy_Impl::get_primitive (
-- CORBA_Object *_collocated_tao_target_,
++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_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 = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
++ 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",
-- 13,
-- 1,
-- istub->orb_core ()
-- );
-+//
-+// End Base & Remote Proxy Implemeentation.
-+///////////////////////////////////////////////////////////////////////
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "get_primitive",
+@@ -11979,7 +11621,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- kind,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << kind)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-- 0
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ kind,
+@@ -12046,7 +11688,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
-+///////////////////////////////////////////////////////////////////////
-+// Remote & Base Proxy Broker Implementation
-+//
-+
-+_TAO_ComponentRepository_Proxy_Broker::_TAO_ComponentRepository_Proxy_Broker (void)
-+{
++ IR_PrimitiveDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -12112,7 +11754,7 @@
+ return _tao_safe_retval._retn ();
}
-IR::StringDef_ptr IR::_TAO_Repository_Remote_Proxy_Impl::create_string (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+_TAO_ComponentRepository_Proxy_Broker::~_TAO_ComponentRepository_Proxy_Broker (void)
++IR_StringDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_string (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -12121,16 +11763,13 @@
+ CORBA::SystemException
+ ))
{
-
- 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,
-- "create_string",
-- 13,
-- 1,
-- istub->orb_core ()
-- );
-+// Factory function Implementation.
-+_TAO_ComponentRepository_Remote_Proxy_Broker *the_TAO_ComponentRepository_Remote_Proxy_Broker (void)
-+{
-+ static ::_TAO_ComponentRepository_Remote_Proxy_Broker remote_proxy_broker;
-+ return &remote_proxy_broker;
-+}
++ 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);
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "create_string",
+@@ -12151,7 +11790,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_string ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- bound,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << bound)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-- 0
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_string ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ bound,
+@@ -12218,7 +11857,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+_TAO_ComponentRepository_Remote_Proxy_Broker::_TAO_ComponentRepository_Remote_Proxy_Broker (void)
-+{
-+}
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
-+_TAO_ComponentRepository_Remote_Proxy_Broker::~_TAO_ComponentRepository_Remote_Proxy_Broker (void)
-+{
++ IR_StringDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -12284,7 +11923,7 @@
+ return _tao_safe_retval._retn ();
}
-IR::WstringDef_ptr IR::_TAO_Repository_Remote_Proxy_Impl::create_wstring (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+_TAO_ComponentRepository_Proxy_Impl&
-+_TAO_ComponentRepository_Remote_Proxy_Broker::select_proxy (
-+ ::IR_ComponentRepository *object,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
++IR_WstringDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_wstring (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -12293,16 +11932,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_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
--
--
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "create_wstring",
-- 14,
-- 1,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "create_wstring",
+@@ -12323,7 +11959,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- bound,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << bound)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-- 0
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ bound,
+@@ -12390,7 +12026,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
--
++ IR_WstringDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -12456,26 +12092,23 @@
+ return _tao_safe_retval._retn ();
+ }
+
-IR::SequenceDef_ptr IR::_TAO_Repository_Remote_Proxy_Impl::create_sequence (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::ULong bound,
++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
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
++ 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_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
--
--
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "create_sequence",
-- 15,
-- 1,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "create_sequence",
+@@ -12496,7 +12129,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- bound,
-- element_type,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << bound) &&
-- (_tao_out << element_type)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-- 0
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ bound,
+@@ -12565,7 +12198,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
--
++ IR_SequenceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -12631,26 +12264,23 @@
+ return _tao_safe_retval._retn ();
+ }
+
-IR::ArrayDef_ptr IR::_TAO_Repository_Remote_Proxy_Impl::create_array (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::ULong length,
++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
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
++ 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_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 ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "create_array",
+@@ -12671,7 +12301,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_array ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- length,
-- element_type,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << length) &&
-- (_tao_out << element_type)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-- 0
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_array ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ length,
+@@ -12740,7 +12370,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
--
++ IR_ArrayDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -12806,7 +12436,7 @@
+ return _tao_safe_retval._retn ();
+ }
+
-IR::FixedDef_ptr IR::_TAO_Repository_Remote_Proxy_Impl::create_fixed (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::UShort digits,
-- CORBA::Short scale,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
++IR_FixedDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_fixed (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::UShort digits,
+ CORBA::Short scale,
+@@ -12816,16 +12446,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_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
--
--
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "create_fixed",
-- 12,
-- 1,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "create_fixed",
+@@ -12846,7 +12473,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- digits,
-- scale,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << digits) &&
-- (_tao_out << scale)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-- 0
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ digits,
+@@ -12915,7 +12542,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
--
--
--//
--// End Base & Remote Proxy Implemeentation.
--///////////////////////////////////////////////////////////////////////
--
--
--///////////////////////////////////////////////////////////////////////
--// Remote & Base Proxy Broker Implementation
--//
--
++ IR_FixedDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -12991,37 +12618,37 @@
+ // 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)
--{
--}
--
--// Factory Member function Implementation.
--IR::_TAO_Repository_Remote_Proxy_Broker *IR::_TAO_Repository_Remote_Proxy_Broker::the_TAO_Repository_Remote_Proxy_Broker (void)
--{
++_TAO_Repository_Proxy_Broker::~_TAO_Repository_Proxy_Broker (void)
+ {
+ }
+
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_Repository_Remote_Proxy_Broker *
+-IR::_TAO_Repository_Remote_Proxy_Broker::the_TAO_Repository_Remote_Proxy_Broker (void)
++_TAO_Repository_Remote_Proxy_Broker *
++_TAO_Repository_Remote_Proxy_Broker::the_TAO_Repository_Remote_Proxy_Broker (void)
+ {
- static ::IR::_TAO_Repository_Remote_Proxy_Broker remote_proxy_broker;
-- return &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,
-- CORBA::Environment &ACE_TRY_ENV
--)
--{
-- ACE_UNUSED_ARG (object);
-- ACE_UNUSED_ARG (ACE_TRY_ENV);
-- return remote_proxy_impl_;
--}
-+ ACE_UNUSED_ARG (object);
-+ ACE_UNUSED_ARG (ACE_TRY_ENV);
-+ return remote_proxy_impl_;
-+}
-
-
- //
-@@ -12926,111 +7554,113 @@
++_TAO_Repository_Proxy_Impl&
++_TAO_Repository_Remote_Proxy_Broker::select_proxy (
++ ::IR_Repository *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -13037,109 +12664,109 @@
// default constructor
-IR::Repository::Repository (int collocated)
-+IR_ComponentRepository::IR_ComponentRepository (int collocated)
++IR_Repository::IR_Repository (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_Repository_setup_collocation (collocated);
}
// destructor
-IR::Repository::~Repository (void)
-+IR_ComponentRepository::~IR_ComponentRepository (void)
++IR_Repository::~IR_Repository (void)
{}
void
--IR::Repository::_tao_setup_collocation (int collocated)
-+IR_ComponentRepository::_tao_setup_collocation (int collocated)
+-IR::Repository::IR_Repository_setup_collocation (int collocated)
++IR_Repository::IR_Repository_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_Repository_Proxy_Broker_ =
+ this->the_TAO_Repository_Proxy_Broker_ =
- ::IR__TAO_Repository_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_ComponentRepository_Proxy_Broker_ =
-+ _TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_Repository_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_Repository_Proxy_Broker_ =
+ this->the_TAO_Repository_Proxy_Broker_ =
- ::IR::_TAO_Repository_Remote_Proxy_Broker::the_TAO_Repository_Remote_Proxy_Broker ();
-+ this->the_TAO_ComponentRepository_Proxy_Broker_ =
-+ ::the_TAO_ComponentRepository_Remote_Proxy_Broker ();
-+
-+ IR_Repository::_tao_setup_collocation (collocated);
++ ::_TAO_Repository_Remote_Proxy_Broker::the_TAO_Repository_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (IR, Container)::_tao_setup_collocation (collocated);
+ this->IR_Container_setup_collocation (collocated);
}
-void IR::Repository::_tao_any_destructor (void *x)
-+void IR_ComponentRepository::_tao_any_destructor (void *x)
++void IR_Repository::_tao_any_destructor (void *x)
{
- Repository *tmp = ACE_static_cast (Repository*,x);
-+ IR_ComponentRepository *tmp = ACE_static_cast (IR_ComponentRepository*,x);
++ IR_Repository *tmp = ACE_static_cast (IR_Repository*,x);
CORBA::release (tmp);
}
-IR::Repository_ptr IR::Repository::_narrow (
-+IR_ComponentRepository_ptr IR_ComponentRepository::_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_ComponentRepository::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/Repository:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (Repository::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentRepository:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_ComponentRepository::_nil ());
++ ACE_CHECK_RETURN (IR_Repository::_nil ());
if (is_a == 0)
- return Repository::_nil ();
-+ return IR_ComponentRepository::_nil ();
++ return IR_Repository::_nil ();
}
- return Repository::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_ComponentRepository::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_Repository::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::Repository_ptr IR::Repository::_unchecked_narrow (
-+IR_ComponentRepository_ptr IR_ComponentRepository::_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_ComponentRepository::_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_ComponentRepository_ptr default_proxy = IR_ComponentRepository::_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_ComponentRepository_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_ComponentRepository (
++ ::IR_Repository (
stub,
1,
obj->_servant ()),
- Repository::_nil ());
-+ IR_ComponentRepository::_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_ComponentRepository (stub, 0, obj->_servant ()), IR_ComponentRepository::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_Repository (stub, 0, obj->_servant ()), IR_Repository::_nil ());
return default_proxy;
}
else
@@ -15656,14 +7496,14 @@
ACE_reinterpret_cast
(
- Repository_ptr,
-+ IR_ComponentRepository_ptr,
++ IR_Repository_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &Repository::_narrow
-+ &IR_ComponentRepository::_narrow
++ &IR_Repository::_narrow
)
)
);
@@ -15671,8 +7511,8 @@
-IR::Repository_ptr
-IR::Repository::_duplicate (Repository_ptr obj)
-+IR_ComponentRepository_ptr
-+IR_ComponentRepository::_duplicate (IR_ComponentRepository_ptr obj)
++IR_Repository_ptr
++IR_Repository::_duplicate (IR_Repository_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -15680,1066 +7520,539 @@
}
-CORBA::Boolean IR::Repository::_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)
++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/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")) ||
-@@ -13040,38 +7670,50 @@
+@@ -13151,34 +12778,34 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::Repository::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_ComponentRepository::_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_ComponentRepository::_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_Repository::_narrow))
++ &IR_Container::_narrow))
retv = ACE_reinterpret_cast
(
void *,
ACE_static_cast
(
- IR::Container_ptr,
-+ IR_Repository_ptr,
++ IR_Container_ptr,
this
)
);
else if (type == ACE_reinterpret_cast
(ptr_arith_t,
- &::CORBA::IRObject::_narrow))
-+ &IR_Container::_narrow))
++ &CORBA_IRObject::_narrow))
retv = ACE_reinterpret_cast
(
void *,
ACE_static_cast
(
- CORBA::IRObject_ptr,
-+ IR_Container_ptr,
++ CORBA_IRObject_ptr,
this
)
);
-- else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-+ 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));
-
-@@ -13080,1088 +7722,717 @@
+@@ -13191,12 +12818,12 @@
return retv;
}
-const char* IR::Repository::_interface_repository_id (void) const
-+const char* IR_ComponentRepository::_interface_repository_id (void) const
++const char* IR_Repository::_interface_repository_id (void) const
{
-- return "IDL:omg.org/IR/Repository:1.0";
-+ return "IDL:omg.org/IR/ComponentRepository:1.0";
+ return "IDL:omg.org/IR/Repository:1.0";
}
-IR::Contained_ptr IR::Repository::lookup_id (
-- const char * search_id,
-+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_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 (
-+ return this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_component (
- this,
-- search_id,
-+ id,
-+ name,
-+ version,
-+ base_component,
-+ supports_interfaces,
- ACE_TRY_ENV
+@@ -13215,7 +12842,7 @@
);
}
-CORBA::TypeCode_ptr IR::Repository::get_canonical_typecode (
-- CORBA::TypeCode_ptr tc,
-+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,
++CORBA::TypeCode_ptr IR_Repository::get_canonical_typecode (
+ CORBA::TypeCode_ptr tc,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ))
--{
--
-- return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).get_canonical_typecode (
-+{
-+ return this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_home (
- this,
-- tc,
-+ id,
-+ name,
-+ version,
-+ base_home,
-+ managed_component,
-+ primary_key,
- ACE_TRY_ENV
+@@ -13234,8 +12861,8 @@
);
}
-IR::PrimitiveDef_ptr IR::Repository::get_primitive (
- IR::PrimitiveKind kind,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+static const CORBA::Long _oc_IR_ComponentRepository[] =
- {
--
-- return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).get_primitive (
-- this,
-- kind,
-- ACE_TRY_ENV
-- );
--}
-+ 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 = 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)
-+TAO_NAMESPACE_END
++IR_PrimitiveDef_ptr IR_Repository::get_primitive (
++ IR_PrimitiveKind kind,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -13253,7 +12880,7 @@
+ );
+ }
-IR::StringDef_ptr IR::Repository::create_string (
-- CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_string (
-- this,
-- bound,
-- ACE_TRY_ENV
-- );
--}
-+///////////////////////////////////////////////////////////////////////
-+// Base & Remote Proxy Implementation.
-+//
++IR_StringDef_ptr IR_Repository::create_string (
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -13272,7 +12899,7 @@
+ );
+ }
-IR::WstringDef_ptr IR::Repository::create_wstring (
-- CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_wstring (
-- this,
-- bound,
-- ACE_TRY_ENV
-- );
--}
-+_TAO_ModuleDef_Proxy_Impl::_TAO_ModuleDef_Proxy_Impl (void)
-+{}
++IR_WstringDef_ptr IR_Repository::create_wstring (
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -13291,9 +12918,9 @@
+ );
+ }
-IR::SequenceDef_ptr IR::Repository::create_sequence (
-- CORBA::ULong bound,
++IR_SequenceDef_ptr IR_Repository::create_sequence (
+ CORBA::ULong bound,
- 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,
-- element_type,
-- ACE_TRY_ENV
-- );
--}
-+_TAO_ModuleDef_Remote_Proxy_Impl::_TAO_ModuleDef_Remote_Proxy_Impl (void)
-+{}
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -13312,9 +12939,9 @@
+ );
+ }
-IR::ArrayDef_ptr IR::Repository::create_array (
-- CORBA::ULong length,
++IR_ArrayDef_ptr IR_Repository::create_array (
+ CORBA::ULong length,
- 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,
-- element_type,
-- ACE_TRY_ENV
-- );
--}
-+// Remote Implementation of the IDL interface methods
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -13333,7 +12960,7 @@
+ );
+ }
-IR::FixedDef_ptr IR::Repository::create_fixed (
-- CORBA::UShort digits,
-- CORBA::Short scale,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_fixed (
-- this,
-- digits,
-- scale,
-- ACE_TRY_ENV
-- );
--}
-+
-+//
-+// End Base & Remote Proxy Implemeentation.
-+///////////////////////////////////////////////////////////////////////
-
++IR_FixedDef_ptr IR_Repository::create_fixed (
+ CORBA::UShort digits,
+ CORBA::Short scale,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -13354,9 +12981,8 @@
+ );
+ }
--#if (TAO_HAS_INTERCEPTORS == 1)
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::TAO_ClientRequestInfo_IR_Repository_lookup_id (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * search_id,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- search_id_ (search_id)
--{}
-+///////////////////////////////////////////////////////////////////////
-+// Remote & Base Proxy Broker Implementation
-+//
-
--Dynamic::ParameterList *
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::TAO_ClientRequestInfo_IR_Repository_lookup_id (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * search_id,
+@@ -13367,7 +12993,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+_TAO_ModuleDef_Proxy_Broker::_TAO_ModuleDef_Proxy_Broker (void)
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_search_id = parameter_list->length ();
-- parameter_list->length (length_search_id + 1);
-- (*parameter_list)[length_search_id].argument <<= search_id_;
-- (*parameter_list)[length_search_id].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
+ // Generate the argument list on demand.
+@@ -13386,7 +13012,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+_TAO_ModuleDef_Proxy_Broker::~_TAO_ModuleDef_Proxy_Broker (void)
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
- }
+ // Generate the exception list on demand.
+@@ -13399,7 +13025,7 @@
--
--CORBA::Any *
+
+ CORBA::Any *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+// Factory function Implementation.
-+_TAO_ModuleDef_Remote_Proxy_Broker *the_TAO_ModuleDef_Remote_Proxy_Broker (void)
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
-+ static ::_TAO_ModuleDef_Remote_Proxy_Broker remote_proxy_broker;
-+ return &remote_proxy_broker;
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -13415,13 +13041,13 @@
}
--void
+ void
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::result (IR::Contained_ptr result)
-+_TAO_ModuleDef_Remote_Proxy_Broker::_TAO_ModuleDef_Remote_Proxy_Broker (void)
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::result (IR_Contained_ptr result)
{
-- // update the result
-- this->_result = result;
+ // update the result
+ this->_result = result;
}
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::TypeCode_ptr tc,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- tc_ (tc)
--{}
--
--Dynamic::ParameterList *
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::TypeCode_ptr tc,
+@@ -13432,7 +13058,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+_TAO_ModuleDef_Remote_Proxy_Broker::~_TAO_ModuleDef_Remote_Proxy_Broker (void)
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_tc = parameter_list->length ();
-- parameter_list->length (length_tc + 1);
-- (*parameter_list)[length_tc].argument <<= tc_;
-- (*parameter_list)[length_tc].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
+ // Generate the argument list on demand.
+@@ -13451,7 +13077,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+_TAO_ModuleDef_Proxy_Impl&
-+_TAO_ModuleDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_ModuleDef *object,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ ACE_UNUSED_ARG (object);
-+ ACE_UNUSED_ARG (ACE_TRY_ENV);
-+ return remote_proxy_impl_;
- }
+ // Generate the exception list on demand.
+@@ -13464,7 +13090,7 @@
--CORBA::Any *
+ CORBA::Any *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
-+//
-+// End Remote & Base Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-+
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -13480,16 +13106,16 @@
+ }
--void
+ void
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::result (CORBA::TypeCode_ptr result)
-+// default constructor
-+IR_ModuleDef::IR_ModuleDef (int collocated)
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::result (CORBA::TypeCode_ptr result)
{
-- // update the result
-- this->_result = result;
-+ this->_tao_setup_collocation (collocated);
+ // update the result
+ this->_result = result;
}
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::TAO_ClientRequestInfo_IR_Repository_get_primitive (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::TAO_ClientRequestInfo_IR_Repository_get_primitive (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- IR::PrimitiveKind & kind,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- kind_ (kind)
-+// destructor
-+IR_ModuleDef::~IR_ModuleDef (void)
++ IR_PrimitiveKind & kind,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -13497,7 +13123,7 @@
{}
--Dynamic::ParameterList *
+ Dynamic::ParameterList *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void
-+IR_ModuleDef::_tao_setup_collocation (int collocated)
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_kind = parameter_list->length ();
-- parameter_list->length (length_kind + 1);
-- (*parameter_list)[length_kind].argument <<= this->kind_;
--
-- (*parameter_list)[length_kind].mode = Dynamic::PARAM_IN;
-+ 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 ();
-
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ IR_Container::_tao_setup_collocation (collocated);
-+ IR_Contained::_tao_setup_collocation (collocated);
-
-- return exception_list;
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -13517,7 +13143,7 @@
}
--
--CORBA::Any *
+ Dynamic::ExceptionList *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::exceptions (CORBA::Environment &ACE_TRY_ENV)
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -13530,7 +13156,7 @@
+
+
+ CORBA::Any *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void IR_ModuleDef::_tao_any_destructor (void *x)
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
-+ IR_ModuleDef *tmp = ACE_static_cast (IR_ModuleDef*,x);
-+ CORBA::release (tmp);
+ // Generate the result on demand.
+@@ -13546,13 +13172,13 @@
}
--void
+ void
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::result (IR::PrimitiveDef_ptr result)
-+IR_ModuleDef_ptr IR_ModuleDef::_narrow (
-+ CORBA::Object_ptr obj,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::result (IR_PrimitiveDef_ptr result)
{
-- // update the result
-- this->_result = result;
-+ if (CORBA::is_nil (obj))
-+ 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);
+ // update the result
+ this->_result = result;
}
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_string::TAO_ClientRequestInfo_IR_Repository_create_string (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const CORBA::ULong & bound,
-- CORBA::Environment &
-+IR_ModuleDef_ptr IR_ModuleDef::_unchecked_narrow (
-+ CORBA::Object_ptr obj,
-+ CORBA::Environment &
- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- bound_ (bound)
--{}
--
--Dynamic::ParameterList *
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_string::TAO_ClientRequestInfo_IR_Repository_create_string (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const CORBA::ULong & bound,
+@@ -13563,7 +13189,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_string::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_string::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_bound = parameter_list->length ();
-- parameter_list->length (length_bound + 1);
-- (*parameter_list)[length_bound].argument <<= bound_;
-- (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ if (CORBA::is_nil (obj))
-+ return IR_ModuleDef::_nil ();
-+ 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
-+ )
-+ )
-+ );
+ // Generate the argument list on demand.
+@@ -13582,7 +13208,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_string::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR_ModuleDef_ptr
-+IR_ModuleDef::_duplicate (IR_ModuleDef_ptr obj)
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_string::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ if (!CORBA::is_nil (obj))
-+ obj->_add_ref ();
-+ return obj;
- }
+ // Generate the exception list on demand.
+@@ -13595,7 +13221,7 @@
--
--CORBA::Any *
+
+ CORBA::Any *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_string::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+CORBA::Boolean IR_ModuleDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_string::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
+ // Generate the result on demand.
+@@ -13611,13 +13237,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const CORBA::ULong & bound,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- bound_ (bound)
--{}
--
--Dynamic::ParameterList *
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::TAO_ClientRequestInfo_IR_Repository_create_wstring (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const CORBA::ULong & bound,
+@@ -13628,7 +13254,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_bound = parameter_list->length ();
-- parameter_list->length (length_bound + 1);
-- (*parameter_list)[length_bound].argument <<= bound_;
-- (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -13647,7 +13273,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -13660,7 +13286,7 @@
+
+
+ CORBA::Any *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -13676,17 +13302,17 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const CORBA::ULong & bound,
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::TAO_ClientRequestInfo_IR_Repository_create_sequence (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const CORBA::ULong & bound,
- IR::IDLType_ptr element_type,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- bound_ (bound),
-- element_type_ (element_type)
--{}
--
--Dynamic::ParameterList *
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -13695,7 +13321,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_bound = parameter_list->length ();
-- parameter_list->length (length_bound + 1);
-- (*parameter_list)[length_bound].argument <<= bound_;
-- (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_element_type = parameter_list->length ();
-- parameter_list->length (length_element_type + 1);
-- (*parameter_list)[length_element_type].argument <<= this->element_type_;
--
-- (*parameter_list)[length_element_type].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -13720,7 +13346,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -13733,7 +13359,7 @@
+
+
+ CORBA::Any *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -13749,17 +13375,17 @@
+ }
+
+ void
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::result (IR::SequenceDef_ptr result)
--{
-- // update the result
-- this->_result = result;
-+ if (
-+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ModuleDef: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/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);
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const CORBA::ULong & length,
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_array::TAO_ClientRequestInfo_IR_Repository_create_array (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const CORBA::ULong & length,
- IR::IDLType_ptr element_type,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- length_ (length),
-- element_type_ (element_type)
--{}
--
--Dynamic::ParameterList *
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -13768,7 +13394,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_array::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void *IR_ModuleDef::_tao_QueryInterface (ptr_arith_t type)
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_array::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_length = parameter_list->length ();
-- parameter_list->length (length_length + 1);
-- (*parameter_list)[length_length].argument <<= length_;
-- (*parameter_list)[length_length].mode = Dynamic::PARAM_IN;
-+ 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));
-
-- CORBA::ULong length_element_type = parameter_list->length ();
-- parameter_list->length (length_element_type + 1);
-- (*parameter_list)[length_element_type].argument <<= this->element_type_;
--
-- (*parameter_list)[length_element_type].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
+ // Generate the argument list on demand.
+@@ -13793,7 +13419,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_array::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_array::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -13806,7 +13432,7 @@
+
+
+ CORBA::Any *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_array::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
-+ if (retv)
-+ this->_add_ref ();
-+ return retv;
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_array::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -13822,13 +13448,13 @@
}
--void
+ void
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_array::result (IR::ArrayDef_ptr result)
-+const char* IR_ModuleDef::_interface_repository_id (void) const
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_array::result (IR_ArrayDef_ptr result)
{
-- // update the result
-- this->_result = result;
-+ return "IDL:omg.org/IR/ModuleDef:1.0";
+ // update the result
+ this->_result = result;
}
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::TAO_ClientRequestInfo_IR_Repository_create_fixed (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const CORBA::UShort & digits,
-- const CORBA::Short & scale,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- digits_ (digits),
-- scale_ (scale)
--{}
--
--Dynamic::ParameterList *
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::TAO_ClientRequestInfo_IR_Repository_create_fixed (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const CORBA::UShort & digits,
+@@ -13841,7 +13467,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+static const CORBA::Long _oc_IR_ModuleDef[] =
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_digits = parameter_list->length ();
-- parameter_list->length (length_digits + 1);
-- (*parameter_list)[length_digits].argument <<= digits_;
-- (*parameter_list)[length_digits].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_scale = parameter_list->length ();
-- parameter_list->length (length_scale + 1);
-- (*parameter_list)[length_scale].argument <<= scale_;
-- (*parameter_list)[length_scale].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+ 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 = 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
+ // Generate the argument list on demand.
+@@ -13865,7 +13491,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+static const CORBA::Long _oc_IR_ModuleDescription[] =
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ 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 = ModuleDescription
-+ 4, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
+ // Generate the exception list on demand.
+@@ -13878,7 +13504,7 @@
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
--CORBA::Any *
+ CORBA::Any *
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
-+ 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
++IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -13894,20 +13520,21 @@
+ }
--void
+ void
-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::result (IR::FixedDef_ptr result)
--{
-- // update the result
-- this->_result = result;
--}
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
++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
+ #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_ModuleDescription (CORBA::tk_struct, sizeof (_oc_IR_ModuleDescription), (char *) &_oc_IR_ModuleDescription, 0, sizeof (IR_ModuleDescription));
++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)
-+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;
-+}
-+
- ///////////////////////////////////////////////////////////////////////
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Repository, &_tc_TAO_tc_IR_Repository)
+@@ -13917,37 +13544,34 @@
// Base & Remote Proxy Implementation.
//
-IR::_TAO_ComponentRepository_Proxy_Impl::_TAO_ComponentRepository_Proxy_Impl (void)
-+_TAO_ConstantDef_Proxy_Impl::_TAO_ConstantDef_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_ConstantDef_Remote_Proxy_Impl::_TAO_ConstantDef_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 (
-+CORBA::TypeCode_ptr _TAO_ConstantDef_Remote_Proxy_Impl::type (
++IR_ComponentDef_ptr _TAO_ComponentRepository_Remote_Proxy_Impl::create_component (
CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
+ 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 ((
@@ -16750,8 +8063,8 @@
- IR::ComponentDef_ptr _tao_retval = IR::ComponentDef::_nil ();
- IR::ComponentDef_var _tao_safe_retval (_tao_retval);
-
-+ CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
-+ CORBA::TypeCode_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)
@@ -16760,212 +8073,41 @@
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
-- "create_component",
-- 16,
-- 1,
-+ "_get_type",
-+ 9,
-+ 0,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ "create_component",
+@@ -13968,7 +13592,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- name,
-- version,
-- base_component,
-- supports_interfaces,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-- (_tao_out << name) &&
-- (_tao_out << version) &&
-- (_tao_out << base_component) &&
-- (_tao_out << supports_interfaces)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -14043,7 +13667,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -14109,30 +13733,27 @@
return _tao_safe_retval._retn ();
}
-IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
-+IR_IDLType_ptr _TAO_ConstantDef_Remote_Proxy_Impl::type_def (
++IR_HomeDef_ptr _TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
+ 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 ((
@@ -16976,8 +8118,8 @@
- IR::HomeDef_ptr _tao_retval = IR::HomeDef::_nil ();
- IR::HomeDef_var _tao_safe_retval (_tao_retval);
-
-+ IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
-+ IR_IDLType_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)
@@ -16986,544 +8128,173 @@
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
-- "create_home",
-- 11,
-- 1,
-+ "_get_type_def",
-+ 13,
-+ 0,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ "create_home",
+@@ -14153,7 +13774,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home ri (
-- &_tao_call,
-- _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 */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-- (_tao_out << name) &&
-- (_tao_out << version) &&
-- (_tao_out << base_home) &&
-- (_tao_out << managed_component) &&
-- (_tao_out << primary_key)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -14230,7 +13851,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-+ }
-+ break;
-+ }
-+
-+ return _tao_safe_retval._retn ();
-+}
-+
-+void _TAO_ConstantDef_Remote_Proxy_Impl::type_def (
-+ CORBA_Object *_collocated_tao_target_,
-+ 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",
-+ 13,
-+ 1,
-+ istub->orb_core ()
-+ );
-+
-+ for (;;)
-+ {
-+ _tao_call.start (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
- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-+ ACE_CHECK;
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << type_def)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
-+ }
-+
-+ break;
-+ }
-+
-+}
-+
-+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 = _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 (
-+ istub,
-+ "_get_value",
-+ 10,
-+ 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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ 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)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-+ 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;
-+ }
-+
-+ return _tao_safe_retval._retn ();
-+}
-+
-+void _TAO_ConstantDef_Remote_Proxy_Impl::value (
-+ CORBA_Object *_collocated_tao_target_,
-+ const CORBA::Any & 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 ());
-+
-+
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_set_value",
-+ 10,
-+ 1,
-+ istub->orb_core ()
-+ );
-+
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
-+ ACE_CHECK;
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << value)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
-+
-+ break;
-+ }
- }
-
--
- //
- // End Base & Remote Proxy Implemeentation.
- ///////////////////////////////////////////////////////////////////////
-@@ -14171,32 +8442,32 @@
++ IR_HomeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -14306,37 +13927,37 @@
// Remote & Base Proxy Broker Implementation
//
-IR::_TAO_ComponentRepository_Proxy_Broker::_TAO_ComponentRepository_Proxy_Broker (void)
-+_TAO_ConstantDef_Proxy_Broker::_TAO_ConstantDef_Proxy_Broker (void)
++_TAO_ComponentRepository_Proxy_Broker::_TAO_ComponentRepository_Proxy_Broker (void)
{
}
-IR::_TAO_ComponentRepository_Proxy_Broker::~_TAO_ComponentRepository_Proxy_Broker (void)
-+_TAO_ConstantDef_Proxy_Broker::~_TAO_ConstantDef_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_ConstantDef_Remote_Proxy_Broker *the_TAO_ConstantDef_Remote_Proxy_Broker (void)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_ComponentRepository_Remote_Proxy_Broker *
+-IR::_TAO_ComponentRepository_Remote_Proxy_Broker::the_TAO_ComponentRepository_Remote_Proxy_Broker (void)
++_TAO_ComponentRepository_Remote_Proxy_Broker *
++_TAO_ComponentRepository_Remote_Proxy_Broker::the_TAO_ComponentRepository_Remote_Proxy_Broker (void)
{
- static ::IR::_TAO_ComponentRepository_Remote_Proxy_Broker remote_proxy_broker;
-+ static ::_TAO_ConstantDef_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_ConstantDef_Remote_Proxy_Broker::_TAO_ConstantDef_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_ConstantDef_Remote_Proxy_Broker::~_TAO_ConstantDef_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_ConstantDef_Proxy_Impl&
-+_TAO_ConstantDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_ConstantDef *object,
++_TAO_ComponentRepository_Proxy_Impl&
++_TAO_ComponentRepository_Remote_Proxy_Broker::select_proxy (
++ ::IR_ComponentRepository *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -14212,114 +8483,114 @@
+@@ -14352,109 +13973,109 @@
// default constructor
-IR::ComponentRepository::ComponentRepository (int collocated)
-+IR_ConstantDef::IR_ConstantDef (int collocated)
++IR_ComponentRepository::IR_ComponentRepository (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_ComponentRepository_setup_collocation (collocated);
}
// destructor
-IR::ComponentRepository::~ComponentRepository (void)
-+IR_ConstantDef::~IR_ConstantDef (void)
++IR_ComponentRepository::~IR_ComponentRepository (void)
{}
void
--IR::ComponentRepository::_tao_setup_collocation (int collocated)
-+IR_ConstantDef::_tao_setup_collocation (int collocated)
+-IR::ComponentRepository::IR_ComponentRepository_setup_collocation (int collocated)
++IR_ComponentRepository::IR_ComponentRepository_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_ComponentRepository_Proxy_Broker_ =
+ this->the_TAO_ComponentRepository_Proxy_Broker_ =
- ::IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_ConstantDef_Proxy_Broker_ =
-+ _TAO_ConstantDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_ComponentRepository_Proxy_Broker_ =
+ this->the_TAO_ComponentRepository_Proxy_Broker_ =
- ::IR::_TAO_ComponentRepository_Remote_Proxy_Broker::the_TAO_ComponentRepository_Remote_Proxy_Broker ();
-+ this->the_TAO_ConstantDef_Proxy_Broker_ =
-+ ::the_TAO_ConstantDef_Remote_Proxy_Broker ();
-+
-+ IR_Contained::_tao_setup_collocation (collocated);
++ _TAO_ComponentRepository_Remote_Proxy_Broker::the_TAO_ComponentRepository_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (IR, Repository)::_tao_setup_collocation (collocated);
+ this->IR_Repository_setup_collocation (collocated);
}
-void IR::ComponentRepository::_tao_any_destructor (void *x)
-+void IR_ConstantDef::_tao_any_destructor (void *x)
++void IR_ComponentRepository::_tao_any_destructor (void *x)
{
- ComponentRepository *tmp = ACE_static_cast (ComponentRepository*,x);
-+ IR_ConstantDef *tmp = ACE_static_cast (IR_ConstantDef*,x);
++ IR_ComponentRepository *tmp = ACE_static_cast (IR_ComponentRepository*,x);
CORBA::release (tmp);
}
-IR::ComponentRepository_ptr IR::ComponentRepository::_narrow (
-+IR_ConstantDef_ptr IR_ConstantDef::_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_ConstantDef::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentRepository:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (ComponentRepository::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ConstantDef:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_ConstantDef::_nil ());
++ ACE_CHECK_RETURN (IR_ComponentRepository::_nil ());
if (is_a == 0)
- return ComponentRepository::_nil ();
-+ return IR_ConstantDef::_nil ();
++ return IR_ComponentRepository::_nil ();
}
- return ComponentRepository::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_ConstantDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_ComponentRepository::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::ComponentRepository_ptr IR::ComponentRepository::_unchecked_narrow (
-+IR_ConstantDef_ptr IR_ConstantDef::_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_ConstantDef::_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_ConstantDef_ptr default_proxy = IR_ConstantDef::_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_ConstantDef_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_ConstantDef (
++ ::IR_ComponentRepository (
stub,
1,
obj->_servant ()),
- ComponentRepository::_nil ());
-+ IR_ConstantDef::_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_ConstantDef (stub, 0, obj->_servant ()), IR_ConstantDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_ComponentRepository (stub, 0, obj->_servant ()), IR_ComponentRepository::_nil ());
return default_proxy;
}
else
@@ -17531,14 +8302,14 @@
ACE_reinterpret_cast
(
- ComponentRepository_ptr,
-+ IR_ConstantDef_ptr,
++ IR_ComponentRepository_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &ComponentRepository::_narrow
-+ &IR_ConstantDef::_narrow
++ &IR_ComponentRepository::_narrow
)
)
);
@@ -17546,8 +8317,8 @@
-IR::ComponentRepository_ptr
-IR::ComponentRepository::_duplicate (ComponentRepository_ptr obj)
-+IR_ConstantDef_ptr
-+IR_ConstantDef::_duplicate (IR_ConstantDef_ptr obj)
++IR_ComponentRepository_ptr
++IR_ComponentRepository::_duplicate (IR_ComponentRepository_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -17555,53 +8326,48 @@
}
-CORBA::Boolean IR::ComponentRepository::_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)
++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/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
-@@ -14327,46 +8598,34 @@
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentRepository:1.0")) ||
+@@ -14467,46 +14088,46 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::ComponentRepository::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_ConstantDef::_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_ConstantDef::_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))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_Repository_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
- &ACE_NESTED_CLASS (::IR, Container)::_narrow))
-+ &IR_Contained::_narrow))
++ &IR_Container::_narrow))
retv = ACE_reinterpret_cast
(
void *,
ACE_static_cast
(
- IR::Container_ptr,
-+ IR_Contained_ptr,
++ IR_Container_ptr,
this
)
);
@@ -17619,541 +8385,335 @@
this
)
);
-@@ -14379,282 +8638,162 @@
+@@ -14519,17 +14140,17 @@
return retv;
}
-const char* IR::ComponentRepository::_interface_repository_id (void) const
-+const char* IR_ConstantDef::_interface_repository_id (void) const
++const char* IR_ComponentRepository::_interface_repository_id (void) const
{
-- return "IDL:omg.org/IR/ComponentRepository:1.0";
-+ return "IDL:omg.org/IR/ConstantDef:1.0";
+ return "IDL:omg.org/IR/ComponentRepository:1.0";
}
-IR::ComponentDef_ptr IR::ComponentRepository::create_component (
-- const char * id,
-- const char * name,
-- const char * version,
++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,
-+CORBA::TypeCode_ptr IR_ConstantDef::type (
++ 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 (
-+{
-+ return this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type (
- this,
-- id,
-- name,
-- version,
-- base_component,
-- supports_interfaces,
- ACE_TRY_ENV
+@@ -14551,13 +14172,13 @@
);
}
-IR::HomeDef_ptr IR::ComponentRepository::create_home (
-- const char * id,
-- const char * name,
-- const char * version,
++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_IDLType_ptr IR_ConstantDef::type_def (
++ 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 (
-+ return this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type_def (
- this,
-- id,
-- name,
-- version,
-- base_home,
-- managed_component,
-- primary_key,
- ACE_TRY_ENV
+@@ -14580,16 +14201,15 @@
);
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::TAO_ClientRequestInfo_IR_ComponentRepository_create_component (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::TAO_ClientRequestInfo_IR_ComponentRepository_create_component (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * id,
+ const char * name,
+ const char * version,
- IR::ComponentDef_ptr base_component,
- const IR::InterfaceDefSeq & supports_interfaces,
-- CORBA::Environment &
-+void IR_ConstantDef::type_def (
-+ IR_IDLType_ptr type_def,
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_ComponentDef_ptr base_component,
++ const IR_InterfaceDefSeq & supports_interfaces,
+ CORBA::Environment &
)
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- base_component_ (base_component),
-- supports_interfaces_ (supports_interfaces)
--{}
--
--Dynamic::ParameterList *
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -14601,7 +14221,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_base_component = parameter_list->length ();
-- parameter_list->length (length_base_component + 1);
-- (*parameter_list)[length_base_component].argument <<= this->base_component_;
--
-- (*parameter_list)[length_base_component].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_supports_interfaces = parameter_list->length ();
-- parameter_list->length (length_supports_interfaces + 1);
-- (*parameter_list)[length_supports_interfaces].argument <<= this->supports_interfaces_;
--
-- (*parameter_list)[length_supports_interfaces].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type_def (
-+ this,
-+ type_def,
-+ ACE_TRY_ENV
-+ );
++IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -14642,7 +14262,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+CORBA::Any * IR_ConstantDef::value (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ return this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).value (
-+ this,
-+ ACE_TRY_ENV
-+ );
- }
++IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -14655,7 +14275,7 @@
--
--CORBA::Any *
+
+ CORBA::Any *
-IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void IR_ConstantDef::value (
-+ const CORBA::Any & value,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
-+ this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).value (
-+ this,
-+ value,
-+ ACE_TRY_ENV
-+ );
++IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -14671,21 +14291,21 @@
}
--void
+ void
-IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (IR::ComponentDef_ptr result)
-+static const CORBA::Long _oc_IR_ConstantDef[] =
++IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (IR_ComponentDef_ptr result)
{
-- // update the result
-- this->_result = result;
--}
--
+ // update the result
+ this->_result = result;
+ }
+
-IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::TAO_ClientRequestInfo_IR_ComponentRepository_create_home (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::TAO_ClientRequestInfo_IR_ComponentRepository_create_home (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- base_home_ (base_home),
-- managed_component_ (managed_component),
-- primary_key_ (primary_key)
--{}
-+ 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 = 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
++ IR_HomeDef_ptr base_home,
++ IR_ComponentDef_ptr managed_component,
++ IR_ValueDef_ptr primary_key,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -14698,7 +14318,7 @@
+ {}
--Dynamic::ParameterList *
+ Dynamic::ParameterList *
-IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+static const CORBA::Long _oc_IR_ConstantDescription[] =
++IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_base_home = parameter_list->length ();
-- parameter_list->length (length_base_home + 1);
-- (*parameter_list)[length_base_home].argument <<= this->base_home_;
--
-- (*parameter_list)[length_base_home].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_managed_component = parameter_list->length ();
-- parameter_list->length (length_managed_component + 1);
-- (*parameter_list)[length_managed_component].argument <<= this->managed_component_;
--
-- (*parameter_list)[length_managed_component].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_primary_key = parameter_list->length ();
-- parameter_list->length (length_primary_key + 1);
-- (*parameter_list)[length_primary_key].argument <<= this->primary_key_;
--
-- (*parameter_list)[length_primary_key].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+ 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 = ConstantDescription
-+ 6, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
+ // Generate the argument list on demand.
+@@ -14745,7 +14365,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = 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
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
++IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -14758,7 +14378,7 @@
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
--CORBA::Any *
+ CORBA::Any *
-IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
++IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -14774,20 +14394,21 @@
+ }
--void
+ void
-IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (IR::HomeDef_ptr result)
--{
-- // update the result
-- this->_result = result;
--}
-+ 6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value
-+ CORBA::tk_any,
++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
+ #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_ConstantDescription (CORBA::tk_struct, sizeof (_oc_IR_ConstantDescription), (char *) &_oc_IR_ConstantDescription, 0, sizeof (IR_ConstantDescription));
++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)
-+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;
-+}
-+
-+
- ///////////////////////////////////////////////////////////////////////
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentRepository, &_tc_TAO_tc_IR_ComponentRepository)
+@@ -14797,10 +14418,10 @@
// Base & Remote Proxy Implementation.
//
-IR::_TAO_ModuleDef_Proxy_Impl::_TAO_ModuleDef_Proxy_Impl (void)
-+_TAO_TypedefDef_Proxy_Impl::_TAO_TypedefDef_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_TypedefDef_Remote_Proxy_Impl::_TAO_TypedefDef_Remote_Proxy_Impl (void)
++_TAO_ModuleDef_Remote_Proxy_Impl::_TAO_ModuleDef_Remote_Proxy_Impl (void)
{}
// Remote Implementation of the IDL interface methods
-@@ -14669,32 +8808,32 @@
+@@ -14815,37 +14436,37 @@
// Remote & Base Proxy Broker Implementation
//
-IR::_TAO_ModuleDef_Proxy_Broker::_TAO_ModuleDef_Proxy_Broker (void)
-+_TAO_TypedefDef_Proxy_Broker::_TAO_TypedefDef_Proxy_Broker (void)
++_TAO_ModuleDef_Proxy_Broker::_TAO_ModuleDef_Proxy_Broker (void)
{
}
-IR::_TAO_ModuleDef_Proxy_Broker::~_TAO_ModuleDef_Proxy_Broker (void)
-+_TAO_TypedefDef_Proxy_Broker::~_TAO_TypedefDef_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_TypedefDef_Remote_Proxy_Broker *the_TAO_TypedefDef_Remote_Proxy_Broker (void)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_ModuleDef_Remote_Proxy_Broker *
+-IR::_TAO_ModuleDef_Remote_Proxy_Broker::the_TAO_ModuleDef_Remote_Proxy_Broker (void)
++_TAO_ModuleDef_Remote_Proxy_Broker *
++_TAO_ModuleDef_Remote_Proxy_Broker::the_TAO_ModuleDef_Remote_Proxy_Broker (void)
{
- static ::IR::_TAO_ModuleDef_Remote_Proxy_Broker remote_proxy_broker;
-+ static ::_TAO_TypedefDef_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_TypedefDef_Remote_Proxy_Broker::_TAO_TypedefDef_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_TypedefDef_Remote_Proxy_Broker::~_TAO_TypedefDef_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_TypedefDef_Proxy_Impl&
-+_TAO_TypedefDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_TypedefDef *object,
++_TAO_ModuleDef_Proxy_Impl&
++_TAO_ModuleDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_ModuleDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -14710,115 +8849,116 @@
+@@ -14861,111 +14482,110 @@
// default constructor
-IR::ModuleDef::ModuleDef (int collocated)
-+IR_TypedefDef::IR_TypedefDef (int collocated)
++IR_ModuleDef::IR_ModuleDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_ModuleDef_setup_collocation (collocated);
}
// destructor
-IR::ModuleDef::~ModuleDef (void)
-+IR_TypedefDef::~IR_TypedefDef (void)
++IR_ModuleDef::~IR_ModuleDef (void)
{}
void
--IR::ModuleDef::_tao_setup_collocation (int collocated)
-+IR_TypedefDef::_tao_setup_collocation (int collocated)
+-IR::ModuleDef::IR_ModuleDef_setup_collocation (int collocated)
++IR_ModuleDef::IR_ModuleDef_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_ModuleDef_Proxy_Broker_ =
+ this->the_TAO_ModuleDef_Proxy_Broker_ =
- ::IR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_TypedefDef_Proxy_Broker_ =
-+ _TAO_TypedefDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_ModuleDef_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_ModuleDef_Proxy_Broker_ =
+ this->the_TAO_ModuleDef_Proxy_Broker_ =
- ::IR::_TAO_ModuleDef_Remote_Proxy_Broker::the_TAO_ModuleDef_Remote_Proxy_Broker ();
-+ this->the_TAO_TypedefDef_Proxy_Broker_ =
-+ ::the_TAO_TypedefDef_Remote_Proxy_Broker ();
-+
-+ IR_Contained::_tao_setup_collocation (collocated);
-+ IR_IDLType::_tao_setup_collocation (collocated);
++ _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);
+ this->IR_Container_setup_collocation (collocated);
+-
+ this->IR_Contained_setup_collocation (collocated);
}
-void IR::ModuleDef::_tao_any_destructor (void *x)
-+void IR_TypedefDef::_tao_any_destructor (void *x)
++void IR_ModuleDef::_tao_any_destructor (void *x)
{
- ModuleDef *tmp = ACE_static_cast (ModuleDef*,x);
-+ IR_TypedefDef *tmp = ACE_static_cast (IR_TypedefDef*,x);
++ IR_ModuleDef *tmp = ACE_static_cast (IR_ModuleDef*,x);
CORBA::release (tmp);
}
-IR::ModuleDef_ptr IR::ModuleDef::_narrow (
-+IR_TypedefDef_ptr IR_TypedefDef::_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_TypedefDef::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ModuleDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (ModuleDef::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/TypedefDef:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_TypedefDef::_nil ());
++ ACE_CHECK_RETURN (IR_ModuleDef::_nil ());
if (is_a == 0)
- return ModuleDef::_nil ();
-+ return IR_TypedefDef::_nil ();
++ return IR_ModuleDef::_nil ();
}
- return ModuleDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_TypedefDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_ModuleDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::ModuleDef_ptr IR::ModuleDef::_unchecked_narrow (
-+IR_TypedefDef_ptr IR_TypedefDef::_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_TypedefDef::_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_TypedefDef_ptr default_proxy = IR_TypedefDef::_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_TypedefDef_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_TypedefDef (
++ ::IR_ModuleDef (
stub,
1,
obj->_servant ()),
- ModuleDef::_nil ());
-+ IR_TypedefDef::_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_TypedefDef (stub, 0, obj->_servant ()), IR_TypedefDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_ModuleDef (stub, 0, obj->_servant ()), IR_ModuleDef::_nil ());
return default_proxy;
}
else
@@ -18161,14 +8721,14 @@
ACE_reinterpret_cast
(
- ModuleDef_ptr,
-+ IR_TypedefDef_ptr,
++ IR_ModuleDef_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &ModuleDef::_narrow
-+ &IR_TypedefDef::_narrow
++ &IR_ModuleDef::_narrow
)
)
);
@@ -18176,8 +8736,8 @@
-IR::ModuleDef_ptr
-IR::ModuleDef::_duplicate (ModuleDef_ptr obj)
-+IR_TypedefDef_ptr
-+IR_TypedefDef::_duplicate (IR_TypedefDef_ptr obj)
++IR_ModuleDef_ptr
++IR_ModuleDef::_duplicate (IR_ModuleDef_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -18185,55 +8745,48 @@
}
-CORBA::Boolean IR::ModuleDef::_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)
++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")) ||
-- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container: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
-@@ -14826,46 +8966,46 @@
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ModuleDef:1.0")) ||
+@@ -14978,46 +14598,46 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::ModuleDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_TypedefDef::_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_TypedefDef::_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_Contained::_narrow))
++ &IR_Container::_narrow))
retv = ACE_reinterpret_cast
(
void *,
ACE_static_cast
(
- IR::Container_ptr,
-+ IR_Contained_ptr,
++ IR_Container_ptr,
this
)
);
else if (type == ACE_reinterpret_cast
(ptr_arith_t,
- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+ &IR_IDLType::_narrow))
++ &IR_Contained::_narrow))
retv = ACE_reinterpret_cast
(
void *,
ACE_static_cast
(
- IR::Contained_ptr,
-+ IR_IDLType_ptr,
++ IR_Contained_ptr,
this
)
);
@@ -18251,71 +8804,52 @@
this
)
);
-@@ -14878,31 +9018,29 @@
+@@ -15030,25 +14650,23 @@
return retv;
}
-const char* IR::ModuleDef::_interface_repository_id (void) const
-+const char* IR_TypedefDef::_interface_repository_id (void) const
++const char* IR_ModuleDef::_interface_repository_id (void) const
{
-- return "IDL:omg.org/IR/ModuleDef:1.0";
-+ return "IDL:omg.org/IR/TypedefDef:1.0";
+ return "IDL:omg.org/IR/ModuleDef:1.0";
}
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-#endif /* TAO_HAS_INTERCEPTORS */
--static const CORBA::Long _oc_IR_ModuleDef[] =
-+static const CORBA::Long _oc_IR_TypedefDef[] =
+ 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
+ 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
-+ 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 = IR_TypedefDef
++ 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_TypedefDef (CORBA::tk_objref, sizeof (_oc_IR_TypedefDef), (char *) &_oc_IR_TypedefDef, 0, sizeof (IR_TypedefDef));
++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_DEFINE (CORBA::TypeCode_ptr, _tc_TypedefDef, &_tc_TAO_tc_IR_TypedefDef)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ModuleDef, &_tc_TAO_tc_IR_ModuleDef)
TAO_NAMESPACE_END
--static const CORBA::Long _oc_IR_ModuleDescription[] =
+
-+static const CORBA::Long _oc_IR_TypeDescription[] =
+ 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 = ModuleDescription
-- 4, // member count
-+ 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 = TypeDescription
-+ 5, // member count
- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
- CORBA::tk_alias, // typecode kind for typedefs
- 64, // encapsulation length
-@@ -14939,32 +9077,35 @@
- CORBA::tk_string,
+@@ -15092,31 +14710,31 @@
0U, // string length
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
-+
};
-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_TypeDescription (CORBA::tk_struct, sizeof (_oc_IR_TypeDescription), (char *) &_oc_IR_TypeDescription, 0, sizeof (IR_TypeDescription));
++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_DEFINE (CORBA::TypeCode_ptr, _tc_TypeDescription, &_tc_TAO_tc_IR_TypeDescription)
+ 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_TypeDescription::_tao_any_destructor (void *x)
++void IR_ModuleDescription::_tao_any_destructor (void *x)
{
- ModuleDescription *tmp = ACE_static_cast (ModuleDescription*,x);
-+ IR_TypeDescription *tmp = ACE_static_cast (IR_TypeDescription*,x);
++ IR_ModuleDescription *tmp = ACE_static_cast (IR_ModuleDescription*,x);
delete tmp;
}
@@ -18325,224 +8859,56 @@
//
-IR::_TAO_ConstantDef_Proxy_Impl::_TAO_ConstantDef_Proxy_Impl (void)
-+_TAO_StructDef_Proxy_Impl::_TAO_StructDef_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_StructDef_Remote_Proxy_Impl::_TAO_StructDef_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 (
-+IR_StructMemberSeq * _TAO_StructDef_Remote_Proxy_Impl::members (
++CORBA::TypeCode_ptr _TAO_ConstantDef_Remote_Proxy_Impl::type (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -14972,819 +9113,165 @@
+@@ -15124,16 +14742,13 @@
CORBA::SystemException
))
{
-
-- CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
-- CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
--
-+ IR_StructMemberSeq *_tao_retval = 0;
+ 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);
-
-+ 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_type",
-- 9,
-+ "_get_members",
-+ 12,
- 0,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ "_get_type",
+@@ -15154,7 +14769,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ 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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ 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)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -15276,7 +14891,7 @@
return _tao_safe_retval._retn ();
}
-IR::IDLType_ptr IR::_TAO_ConstantDef_Remote_Proxy_Impl::type_def (
-+void _TAO_StructDef_Remote_Proxy_Impl::members (
++IR_IDLType_ptr _TAO_ConstantDef_Remote_Proxy_Impl::type_def (
CORBA_Object *_collocated_tao_target_,
-+ const IR_StructMemberSeq & members,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
+@@ -15284,16 +14899,13 @@
CORBA::SystemException
))
{
@@ -18550,818 +8916,285 @@
- 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);
-+ ACE_THROW (CORBA::INTERNAL ());
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
-- "_get_type_def",
-- 13,
-- 0,
-+ "_set_members",
-+ 12,
-+ 1,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ "_get_type_def",
+@@ -15314,7 +14926,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -15370,7 +14982,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-+ ACE_CHECK;
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << members)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
-
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
-+
-+ break;
-+ }
++ IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -15436,19 +15048,15 @@
+ return _tao_safe_retval._retn ();
}
-void IR::_TAO_ConstantDef_Remote_Proxy_Impl::type_def (
-- CORBA_Object *_collocated_tao_target_,
++void _TAO_ConstantDef_Remote_Proxy_Impl::type_def (
+ CORBA_Object *_collocated_tao_target_,
- 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 ());
-+//
-+// End Base & Remote Proxy Implemeentation.
-+///////////////////////////////////////////////////////////////////////
-
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
-
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_set_type_def",
-- 13,
-- 1,
-- istub->orb_core ()
-- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
+-
-
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -15474,7 +15082,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- type_def,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << type_def)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+///////////////////////////////////////////////////////////////////////
-+// Remote & Base Proxy Broker Implementation
-+//
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
-+_TAO_StructDef_Proxy_Broker::_TAO_StructDef_Proxy_Broker (void)
-+{
++ IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ type_def,
+@@ -15588,7 +15196,7 @@
+
}
-CORBA::Any * IR::_TAO_ConstantDef_Remote_Proxy_Impl::value (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+_TAO_StructDef_Proxy_Broker::~_TAO_StructDef_Proxy_Broker (void)
++CORBA::Any * _TAO_ConstantDef_Remote_Proxy_Impl::value (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -15596,15 +15204,12 @@
+ CORBA::SystemException
+ ))
{
-
-- CORBA::Any *_tao_retval = 0;
--
+ CORBA::Any *_tao_retval = 0;
+
-
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 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 (
-- istub,
-- "_get_value",
-- 10,
-- 0,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ ACE_NEW_RETURN (_tao_retval, CORBA::Any, _tao_retval);
+ CORBA::Any_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+@@ -15627,7 +15232,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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::Any * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
--
++ IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -15749,7 +15354,7 @@
+ return _tao_safe_retval._retn ();
+ }
+
-void IR::_TAO_ConstantDef_Remote_Proxy_Impl::value (
-- CORBA_Object *_collocated_tao_target_,
-- const CORBA::Any & 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 ());
--
++void _TAO_ConstantDef_Remote_Proxy_Impl::value (
+ CORBA_Object *_collocated_tao_target_,
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -15758,10 +15363,6 @@
+ CORBA::SystemException
+ ))
+ {
-
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_set_value",
-- 10,
-- 1,
-- istub->orb_core ()
-- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -15787,7 +15388,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- value,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << value)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
--}
--
--
--//
--// End Base & Remote Proxy Implemeentation.
--///////////////////////////////////////////////////////////////////////
--
--
--///////////////////////////////////////////////////////////////////////
--// Remote & Base Proxy Broker Implementation
--//
++ IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ value,
+@@ -15901,7 +15502,6 @@
+
+ }
+
-
+ //
+ // End Base & Remote Proxy Implemeentation.
+ ///////////////////////////////////////////////////////////////////////
+@@ -15911,37 +15511,37 @@
+ // 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)
--{
--}
--
--// 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_StructDef_Remote_Proxy_Broker *the_TAO_StructDef_Remote_Proxy_Broker (void)
++_TAO_ConstantDef_Proxy_Broker::~_TAO_ConstantDef_Proxy_Broker (void)
+ {
+ }
+
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_ConstantDef_Remote_Proxy_Broker *
+-IR::_TAO_ConstantDef_Remote_Proxy_Broker::the_TAO_ConstantDef_Remote_Proxy_Broker (void)
++_TAO_ConstantDef_Remote_Proxy_Broker *
++_TAO_ConstantDef_Remote_Proxy_Broker::the_TAO_ConstantDef_Remote_Proxy_Broker (void)
{
- static ::IR::_TAO_ConstantDef_Remote_Proxy_Broker remote_proxy_broker;
-+ static ::_TAO_StructDef_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_StructDef_Remote_Proxy_Broker::_TAO_StructDef_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_StructDef_Remote_Proxy_Broker::~_TAO_StructDef_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_StructDef_Proxy_Impl&
-+_TAO_StructDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_StructDef *object,
++_TAO_ConstantDef_Proxy_Impl&
++_TAO_ConstantDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_ConstantDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -15800,113 +9287,118 @@
+@@ -15957,109 +15557,109 @@
// default constructor
-IR::ConstantDef::ConstantDef (int collocated)
-+IR_StructDef::IR_StructDef (int collocated)
++IR_ConstantDef::IR_ConstantDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_ConstantDef_setup_collocation (collocated);
}
// destructor
-IR::ConstantDef::~ConstantDef (void)
-+IR_StructDef::~IR_StructDef (void)
++IR_ConstantDef::~IR_ConstantDef (void)
{}
void
--IR::ConstantDef::_tao_setup_collocation (int collocated)
-+IR_StructDef::_tao_setup_collocation (int collocated)
+-IR::ConstantDef::IR_ConstantDef_setup_collocation (int collocated)
++IR_ConstantDef::IR_ConstantDef_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_ConstantDef_Proxy_Broker_ =
+ this->the_TAO_ConstantDef_Proxy_Broker_ =
- ::IR__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_StructDef_Proxy_Broker_ =
-+ _TAO_StructDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_ConstantDef_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_ConstantDef_Proxy_Broker_ =
+ this->the_TAO_ConstantDef_Proxy_Broker_ =
- ::IR::_TAO_ConstantDef_Remote_Proxy_Broker::the_TAO_ConstantDef_Remote_Proxy_Broker ();
-+ this->the_TAO_StructDef_Proxy_Broker_ =
-+ ::the_TAO_StructDef_Remote_Proxy_Broker ();
-+
-+ IR_TypedefDef::_tao_setup_collocation (collocated);
-+ IR_Container::_tao_setup_collocation (collocated);
++ _TAO_ConstantDef_Remote_Proxy_Broker::the_TAO_ConstantDef_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (IR, Contained)::_tao_setup_collocation (collocated);
+ this->IR_Contained_setup_collocation (collocated);
}
-void IR::ConstantDef::_tao_any_destructor (void *x)
-+void IR_StructDef::_tao_any_destructor (void *x)
++void IR_ConstantDef::_tao_any_destructor (void *x)
{
- ConstantDef *tmp = ACE_static_cast (ConstantDef*,x);
-+ IR_StructDef *tmp = ACE_static_cast (IR_StructDef*,x);
++ IR_ConstantDef *tmp = ACE_static_cast (IR_ConstantDef*,x);
CORBA::release (tmp);
}
-IR::ConstantDef_ptr IR::ConstantDef::_narrow (
-+IR_StructDef_ptr IR_StructDef::_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_StructDef::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ConstantDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (ConstantDef::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/StructDef:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_StructDef::_nil ());
++ ACE_CHECK_RETURN (IR_ConstantDef::_nil ());
if (is_a == 0)
- return ConstantDef::_nil ();
-+ return IR_StructDef::_nil ();
++ return IR_ConstantDef::_nil ();
}
- return ConstantDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_StructDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_ConstantDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::ConstantDef_ptr IR::ConstantDef::_unchecked_narrow (
-+IR_StructDef_ptr IR_StructDef::_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_StructDef::_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_StructDef_ptr default_proxy = IR_StructDef::_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_StructDef_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_StructDef (
++ ::IR_ConstantDef (
stub,
1,
obj->_servant ()),
- ConstantDef::_nil ());
-+ IR_StructDef::_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_StructDef (stub, 0, obj->_servant ()), IR_StructDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_ConstantDef (stub, 0, obj->_servant ()), IR_ConstantDef::_nil ());
return default_proxy;
}
else
@@ -19369,14 +9202,14 @@
ACE_reinterpret_cast
(
- ConstantDef_ptr,
-+ IR_StructDef_ptr,
++ IR_ConstantDef_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &ConstantDef::_narrow
-+ &IR_StructDef::_narrow
++ &IR_ConstantDef::_narrow
)
)
);
@@ -19384,8 +9217,8 @@
-IR::ConstantDef_ptr
-IR::ConstantDef::_duplicate (ConstantDef_ptr obj)
-+IR_StructDef_ptr
-+IR_StructDef::_duplicate (IR_StructDef_ptr obj)
++IR_ConstantDef_ptr
++IR_ConstantDef::_duplicate (IR_ConstantDef_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -19393,78 +9226,34 @@
}
-CORBA::Boolean IR::ConstantDef::_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)
++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/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
-@@ -15914,34 +9406,70 @@
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ConstantDef:1.0")) ||
+@@ -16071,34 +15671,34 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::ConstantDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_StructDef::_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_StructDef::_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_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::Contained_ptr,
-+ IR_IDLType_ptr,
++ IR_Contained_ptr,
this
)
);
@@ -19482,923 +9271,470 @@
this
)
);
-@@ -15954,452 +9482,392 @@
+@@ -16111,12 +15711,12 @@
return retv;
}
-const char* IR::ConstantDef::_interface_repository_id (void) const
-+const char* IR_StructDef::_interface_repository_id (void) const
++const char* IR_ConstantDef::_interface_repository_id (void) const
{
-- return "IDL:omg.org/IR/ConstantDef:1.0";
-+ return "IDL:omg.org/IR/StructDef:1.0";
+ return "IDL:omg.org/IR/ConstantDef:1.0";
}
-CORBA::TypeCode_ptr IR::ConstantDef::type (
-+IR_StructMemberSeq * IR_StructDef::members (
++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 (
-+ return this->the_TAO_StructDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
- this,
- ACE_TRY_ENV
+@@ -16133,7 +15733,7 @@
);
}
-IR::IDLType_ptr IR::ConstantDef::type_def (
-+void IR_StructDef::members (
-+ const IR_StructMemberSeq & members,
++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->the_TAO_StructDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
- this,
-+ members,
- ACE_TRY_ENV
+@@ -16150,8 +15750,8 @@
);
}
-void IR::ConstantDef::type_def (
- IR::IDLType_ptr type_def,
-+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 = 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)
-+TAO_NAMESPACE_END
-+
-+///////////////////////////////////////////////////////////////////////
-+// Base & Remote Proxy Implementation.
-+//
-+
-+_TAO_UnionDef_Proxy_Impl::_TAO_UnionDef_Proxy_Impl (void)
-+{}
-+
-+_TAO_UnionDef_Remote_Proxy_Impl::_TAO_UnionDef_Remote_Proxy_Impl (void)
-+{}
-+
-+// Remote Implementation of the IDL interface methods
-+
-+CORBA::TypeCode_ptr _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
-+ CORBA_Object *_collocated_tao_target_,
++void IR_ConstantDef::type_def (
++ IR_IDLType_ptr type_def,
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);
-
-- this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type_def (
-- this,
-- type_def,
-- ACE_TRY_ENV
-+ 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",
-+ 23,
-+ 0,
-+ istub->orb_core ()
+@@ -16169,7 +15769,7 @@
);
-+
-+ 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;
-+ }
-+
-+ return _tao_safe_retval._retn ();
}
-CORBA::Any * IR::ConstantDef::value (
-+IR_IDLType_ptr _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
-+ CORBA_Object *_collocated_tao_target_,
++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
-+ 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",
-+ 27,
-+ 0,
-+ istub->orb_core ()
+@@ -16186,7 +15786,7 @@
);
-+
-+ 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;
-+ }
-+
-+ return _tao_safe_retval._retn ();
}
-void IR::ConstantDef::value (
-- const CORBA::Any & value,
-+void _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
-+ CORBA_Object *_collocated_tao_target_,
-+ IR_IDLType_ptr discriminator_type_def,
++void IR_ConstantDef::value (
+ const CORBA::Any & 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 ());
-+
-
-- this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).value (
-- this,
-- value,
-- ACE_TRY_ENV
-- );
--}
--
+@@ -16205,9 +15805,8 @@
+ );
+ }
+
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::TAO_ClientRequestInfo_IR_ConstantDef_type_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::TAO_ClientRequestInfo_IR_ConstantDef_type_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -16216,7 +15815,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -16228,7 +15827,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -16241,7 +15840,7 @@
+
+
+ CORBA::Any *
-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -16257,13 +15856,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -16272,7 +15871,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -16284,7 +15883,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -16297,7 +15896,7 @@
+
+
+ CORBA::Any *
-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -16313,16 +15912,16 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- IR::IDLType_ptr type_def,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- type_def_ (type_def)
--{}
--
--Dynamic::ParameterList *
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -16330,7 +15929,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_type_def = parameter_list->length ();
-- parameter_list->length (length_type_def + 1);
-- (*parameter_list)[length_type_def].argument <<= this->type_def_;
--
-- (*parameter_list)[length_type_def].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -16350,7 +15949,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_set_discriminator_type_def",
-+ 27,
-+ 1,
-+ istub->orb_core ()
-+ );
-
--CORBA::Any *
++IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -16363,7 +15962,7 @@
+
+
+ CORBA::Any *
-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
-+ for (;;)
-+ {
-+ _tao_call.start (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 << discriminator_type_def)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
-+ {
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
-+ }
-+
-+ break;
-+ }
++IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -16375,7 +15974,7 @@
+ return result_any;
}
-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::TAO_ClientRequestInfo_IR_ConstantDef_value_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-+IR_UnionMemberSeq * _TAO_UnionDef_Remote_Proxy_Impl::members (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::TAO_ClientRequestInfo_IR_ConstantDef_value_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -16384,7 +15983,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -16396,7 +15995,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ IR_UnionMemberSeq *_tao_retval = 0;
-
-- return exception_list;
--}
-+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
++IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -16409,7 +16008,7 @@
-+ 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",
-+ 12,
-+ 0,
-+ istub->orb_core ()
-+ );
-
--CORBA::Any *
+
+ CORBA::Any *
-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
-+ 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;
-+ }
++IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -16425,13 +16024,13 @@
+ }
--void
+ void
-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::result (CORBA::Any * result)
--{
-- // update the result
-- this->_result = result;
-+ return _tao_safe_retval._retn ();
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const CORBA::Any & value,
-- CORBA::Environment &
-+void _TAO_UnionDef_Remote_Proxy_Impl::members (
-+ CORBA_Object *_collocated_tao_target_,
-+ const IR_UnionMemberSeq & members,
-+ CORBA::Environment &ACE_TRY_ENV
- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- value_ (value)
--{}
--
--Dynamic::ParameterList *
++IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::TAO_ClientRequestInfo_IR_ConstantDef_value_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const CORBA::Any & value,
+@@ -16442,7 +16041,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_value = parameter_list->length ();
-- parameter_list->length (length_value + 1);
-- (*parameter_list)[length_value].argument <<= value_;
-- (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -16461,7 +16060,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
-+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW (CORBA::INTERNAL ());
++IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -16474,7 +16073,7 @@
--CORBA::Any *
+
+ CORBA::Any *
-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return result_any;
--}
--
--#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
++IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -16487,17 +16086,19 @@
+ }
+
+ #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));
--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 = ConstantDescription
-- 6, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
--
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
--
-- 6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value
-- CORBA::tk_any,
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_set_members",
-+ 12,
-+ 1,
-+ istub->orb_core ()
-+ );
++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
+@@ -16547,14 +16148,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));
--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
++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);
-- delete tmp;
-+ for (;;)
-+ {
-+ _tao_call.start (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 << members)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
-+ {
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
-+ }
-+
-+ break;
-+ }
++ IR_ConstantDescription *tmp = ACE_static_cast (IR_ConstantDescription*,x);
+ delete tmp;
}
+@@ -16563,10 +16165,10 @@
+ // Base & Remote Proxy Implementation.
+ //
--///////////////////////////////////////////////////////////////////////
--// 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)
--{}
--
--// Remote Implementation of the IDL interface methods
--
--
- //
- // End Base & Remote Proxy Implemeentation.
- ///////////////////////////////////////////////////////////////////////
-@@ -16409,32 +9877,32 @@
++_TAO_TypedefDef_Remote_Proxy_Impl::_TAO_TypedefDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+@@ -16581,37 +16183,37 @@
// Remote & Base Proxy Broker Implementation
//
-IR::_TAO_TypedefDef_Proxy_Broker::_TAO_TypedefDef_Proxy_Broker (void)
-+_TAO_UnionDef_Proxy_Broker::_TAO_UnionDef_Proxy_Broker (void)
++_TAO_TypedefDef_Proxy_Broker::_TAO_TypedefDef_Proxy_Broker (void)
{
}
-IR::_TAO_TypedefDef_Proxy_Broker::~_TAO_TypedefDef_Proxy_Broker (void)
-+_TAO_UnionDef_Proxy_Broker::~_TAO_UnionDef_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_UnionDef_Remote_Proxy_Broker *the_TAO_UnionDef_Remote_Proxy_Broker (void)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_TypedefDef_Remote_Proxy_Broker *
+-IR::_TAO_TypedefDef_Remote_Proxy_Broker::the_TAO_TypedefDef_Remote_Proxy_Broker (void)
++_TAO_TypedefDef_Remote_Proxy_Broker *
++_TAO_TypedefDef_Remote_Proxy_Broker::the_TAO_TypedefDef_Remote_Proxy_Broker (void)
{
- static ::IR::_TAO_TypedefDef_Remote_Proxy_Broker remote_proxy_broker;
-+ static ::_TAO_UnionDef_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_UnionDef_Remote_Proxy_Broker::_TAO_UnionDef_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_UnionDef_Remote_Proxy_Broker::~_TAO_UnionDef_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_UnionDef_Proxy_Impl&
-+_TAO_UnionDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_UnionDef *object,
++_TAO_TypedefDef_Proxy_Impl&
++_TAO_TypedefDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_TypedefDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -16450,113 +9918,115 @@
+@@ -16627,111 +16229,110 @@
// default constructor
-IR::TypedefDef::TypedefDef (int collocated)
-+IR_UnionDef::IR_UnionDef (int collocated)
++IR_TypedefDef::IR_TypedefDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_TypedefDef_setup_collocation (collocated);
}
// destructor
-IR::TypedefDef::~TypedefDef (void)
-+IR_UnionDef::~IR_UnionDef (void)
++IR_TypedefDef::~IR_TypedefDef (void)
{}
void
--IR::TypedefDef::_tao_setup_collocation (int collocated)
-+IR_UnionDef::_tao_setup_collocation (int collocated)
+-IR::TypedefDef::IR_TypedefDef_setup_collocation (int collocated)
++IR_TypedefDef::IR_TypedefDef_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_TypedefDef_Proxy_Broker_ =
+ this->the_TAO_TypedefDef_Proxy_Broker_ =
- ::IR__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_UnionDef_Proxy_Broker_ =
-+ _TAO_UnionDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_TypedefDef_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_TypedefDef_Proxy_Broker_ =
+ this->the_TAO_TypedefDef_Proxy_Broker_ =
- ::IR::_TAO_TypedefDef_Remote_Proxy_Broker::the_TAO_TypedefDef_Remote_Proxy_Broker ();
-+ this->the_TAO_UnionDef_Proxy_Broker_ =
-+ ::the_TAO_UnionDef_Remote_Proxy_Broker ();
++ _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_TypedefDef::_tao_setup_collocation (collocated);
-+ IR_Container::_tao_setup_collocation (collocated);
+ this->IR_Contained_setup_collocation (collocated);
+-
+ this->IR_IDLType_setup_collocation (collocated);
}
-void IR::TypedefDef::_tao_any_destructor (void *x)
-+void IR_UnionDef::_tao_any_destructor (void *x)
++void IR_TypedefDef::_tao_any_destructor (void *x)
{
- TypedefDef *tmp = ACE_static_cast (TypedefDef*,x);
-+ IR_UnionDef *tmp = ACE_static_cast (IR_UnionDef*,x);
++ IR_TypedefDef *tmp = ACE_static_cast (IR_TypedefDef*,x);
CORBA::release (tmp);
}
-IR::TypedefDef_ptr IR::TypedefDef::_narrow (
-+IR_UnionDef_ptr IR_UnionDef::_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_UnionDef::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/TypedefDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (TypedefDef::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/UnionDef:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_UnionDef::_nil ());
++ ACE_CHECK_RETURN (IR_TypedefDef::_nil ());
if (is_a == 0)
- return TypedefDef::_nil ();
-+ return IR_UnionDef::_nil ();
++ return IR_TypedefDef::_nil ();
}
- return TypedefDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_UnionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_TypedefDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::TypedefDef_ptr IR::TypedefDef::_unchecked_narrow (
-+IR_UnionDef_ptr IR_UnionDef::_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_UnionDef::_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_UnionDef_ptr default_proxy = IR_UnionDef::_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_UnionDef_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_UnionDef (
++ ::IR_TypedefDef (
stub,
1,
obj->_servant ()),
- TypedefDef::_nil ());
-+ IR_UnionDef::_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_UnionDef (stub, 0, obj->_servant ()), IR_UnionDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_TypedefDef (stub, 0, obj->_servant ()), IR_TypedefDef::_nil ());
return default_proxy;
}
else
@@ -20406,14 +9742,14 @@
ACE_reinterpret_cast
(
- TypedefDef_ptr,
-+ IR_UnionDef_ptr,
++ IR_TypedefDef_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &TypedefDef::_narrow
-+ &IR_UnionDef::_narrow
++ &IR_TypedefDef::_narrow
)
)
);
@@ -20421,8 +9757,8 @@
-IR::TypedefDef_ptr
-IR::TypedefDef::_duplicate (TypedefDef_ptr obj)
-+IR_UnionDef_ptr
-+IR_UnionDef::_duplicate (IR_UnionDef_ptr obj)
++IR_TypedefDef_ptr
++IR_TypedefDef::_duplicate (IR_TypedefDef_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -20430,283 +9766,142 @@
}
-CORBA::Boolean IR::TypedefDef::_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)
++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/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")) ||
-@@ -16566,148 +10036,181 @@
+@@ -16744,46 +16345,46 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::TypedefDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_UnionDef::_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_UnionDef::_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_TypedefDef::_narrow))
++ &IR_Contained::_narrow))
retv = ACE_reinterpret_cast
(
void *,
ACE_static_cast
(
- IR::Contained_ptr,
-+ IR_TypedefDef_ptr,
++ IR_Contained_ptr,
this
)
);
else if (type == ACE_reinterpret_cast
(ptr_arith_t,
- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-+ &IR_Container::_narrow))
++ &IR_IDLType::_narrow))
retv = ACE_reinterpret_cast
(
void *,
ACE_static_cast
(
- IR::IDLType_ptr,
-+ IR_Container_ptr,
++ IR_IDLType_ptr,
this
)
);
else if (type == ACE_reinterpret_cast
(ptr_arith_t,
- &::CORBA::IRObject::_narrow))
-+ &IR_Contained::_narrow))
++ &CORBA_IRObject::_narrow))
retv = ACE_reinterpret_cast
(
void *,
ACE_static_cast
(
- CORBA::IRObject_ptr,
-+ IR_Contained_ptr,
++ 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));
--
-+ 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 ();
+@@ -16796,25 +16397,23 @@
return retv;
}
-const char* IR::TypedefDef::_interface_repository_id (void) const
-+const char* IR_UnionDef::_interface_repository_id (void) const
++const char* IR_TypedefDef::_interface_repository_id (void) const
{
-- return "IDL:omg.org/IR/TypedefDef:1.0";
-+ return "IDL:omg.org/IR/UnionDef:1.0";
+ 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
+ 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));
--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[] =
-+CORBA::TypeCode_ptr IR_UnionDef::discriminator_type (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
++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
-- 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 = TypeDescription
-- 5, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
-+ return this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).discriminator_type (
-+ this,
-+ ACE_TRY_ENV
-+ );
-+}
-
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
-+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
-+ );
-+}
-
-- 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
-+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,
-+ ACE_TRY_ENV
-+ );
-+}
-
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
-+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
-+ );
-+}
-
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
-+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,
-+ ACE_TRY_ENV
-+ );
-+}
-
-+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 = IR_UnionDef
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -16861,31 +16460,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_UnionDef (CORBA::tk_objref, sizeof (_oc_IR_UnionDef), (char *) &_oc_IR_UnionDef, 0, sizeof (IR_UnionDef));
++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_DEFINE (CORBA::TypeCode_ptr, _tc_UnionDef, &_tc_TAO_tc_IR_UnionDef)
+ 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);
-- delete tmp;
--}
--
++ 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_EnumDef_Proxy_Impl::_TAO_EnumDef_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_EnumDef_Remote_Proxy_Impl::_TAO_EnumDef_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_EnumMemberSeq * _TAO_EnumDef_Remote_Proxy_Impl::members (
++IR_StructMemberSeq * _TAO_StructDef_Remote_Proxy_Impl::members (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -16715,17 +10218,14 @@
+@@ -16893,17 +16492,14 @@
CORBA::SystemException
))
{
-
- IR::StructMemberSeq *_tao_retval = 0;
-
-+ IR_EnumMemberSeq *_tao_retval = 0;
++ IR_StructMemberSeq *_tao_retval = 0;
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
@@ -20715,190 +9910,38 @@
-
- ACE_NEW_RETURN (_tao_retval, IR::StructMemberSeq, _tao_retval);
- IR::StructMemberSeq_var _tao_safe_retval (_tao_retval);
-+ ACE_NEW_RETURN (_tao_retval, IR_EnumMemberSeq, _tao_retval);
-+ IR_EnumMemberSeq_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",
-@@ -16734,158 +10234,63 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -16924,7 +16520,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -16980,7 +16576,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::StructMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ 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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ 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)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_StructMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -17046,19 +16642,15 @@
return _tao_safe_retval._retn ();
}
-void IR::_TAO_StructDef_Remote_Proxy_Impl::members (
-+void _TAO_EnumDef_Remote_Proxy_Impl::members (
++void _TAO_StructDef_Remote_Proxy_Impl::members (
CORBA_Object *_collocated_tao_target_,
- const IR::StructMemberSeq & members,
-+ const IR_EnumMemberSeq & members,
++ const IR_StructMemberSeq & members,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
@@ -20912,323 +9955,165 @@
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
--
- TAO_GIOP_Twoway_Invocation _tao_call (
- istub,
- "_set_members",
-@@ -16894,130 +10299,45 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- members,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << members)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-+ ACE_CHECK;
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << members)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
+@@ -17084,7 +16676,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
- }
--
-- break;
-- }
--
-+
-+ break;
-+ }
- }
-
-
-@@ -17030,32 +10350,32 @@
+ #if TAO_HAS_INTERCEPTORS == 1
+- IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set ri (
++ IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ members,
+@@ -17208,37 +16800,37 @@
// Remote & Base Proxy Broker Implementation
//
-IR::_TAO_StructDef_Proxy_Broker::_TAO_StructDef_Proxy_Broker (void)
-+_TAO_EnumDef_Proxy_Broker::_TAO_EnumDef_Proxy_Broker (void)
++_TAO_StructDef_Proxy_Broker::_TAO_StructDef_Proxy_Broker (void)
{
}
-IR::_TAO_StructDef_Proxy_Broker::~_TAO_StructDef_Proxy_Broker (void)
-+_TAO_EnumDef_Proxy_Broker::~_TAO_EnumDef_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_EnumDef_Remote_Proxy_Broker *the_TAO_EnumDef_Remote_Proxy_Broker (void)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_StructDef_Remote_Proxy_Broker *
+-IR::_TAO_StructDef_Remote_Proxy_Broker::the_TAO_StructDef_Remote_Proxy_Broker (void)
++_TAO_StructDef_Remote_Proxy_Broker *
++_TAO_StructDef_Remote_Proxy_Broker::the_TAO_StructDef_Remote_Proxy_Broker (void)
{
- static ::IR::_TAO_StructDef_Remote_Proxy_Broker remote_proxy_broker;
-+ static ::_TAO_EnumDef_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_EnumDef_Remote_Proxy_Broker::_TAO_EnumDef_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_EnumDef_Remote_Proxy_Broker::~_TAO_EnumDef_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_EnumDef_Proxy_Impl&
-+_TAO_EnumDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_EnumDef *object,
++_TAO_StructDef_Proxy_Impl&
++_TAO_StructDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_StructDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -17071,115 +10391,114 @@
+@@ -17254,111 +16846,110 @@
// default constructor
-IR::StructDef::StructDef (int collocated)
-+IR_EnumDef::IR_EnumDef (int collocated)
++IR_StructDef::IR_StructDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_StructDef_setup_collocation (collocated);
}
// destructor
-IR::StructDef::~StructDef (void)
-+IR_EnumDef::~IR_EnumDef (void)
++IR_StructDef::~IR_StructDef (void)
{}
void
--IR::StructDef::_tao_setup_collocation (int collocated)
-+IR_EnumDef::_tao_setup_collocation (int collocated)
+-IR::StructDef::IR_StructDef_setup_collocation (int collocated)
++IR_StructDef::IR_StructDef_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_StructDef_Proxy_Broker_ =
+ this->the_TAO_StructDef_Proxy_Broker_ =
- ::IR__TAO_StructDef_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_EnumDef_Proxy_Broker_ =
-+ _TAO_EnumDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_StructDef_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_StructDef_Proxy_Broker_ =
+ this->the_TAO_StructDef_Proxy_Broker_ =
- ::IR::_TAO_StructDef_Remote_Proxy_Broker::the_TAO_StructDef_Remote_Proxy_Broker ();
-+ this->the_TAO_EnumDef_Proxy_Broker_ =
-+ ::the_TAO_EnumDef_Remote_Proxy_Broker ();
-+
-+ IR_TypedefDef::_tao_setup_collocation (collocated);
++ _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);
+ this->IR_TypedefDef_setup_collocation (collocated);
+-
+ this->IR_Container_setup_collocation (collocated);
}
-void IR::StructDef::_tao_any_destructor (void *x)
-+void IR_EnumDef::_tao_any_destructor (void *x)
++void IR_StructDef::_tao_any_destructor (void *x)
{
- StructDef *tmp = ACE_static_cast (StructDef*,x);
-+ IR_EnumDef *tmp = ACE_static_cast (IR_EnumDef*,x);
++ IR_StructDef *tmp = ACE_static_cast (IR_StructDef*,x);
CORBA::release (tmp);
}
-IR::StructDef_ptr IR::StructDef::_narrow (
-+IR_EnumDef_ptr IR_EnumDef::_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_EnumDef::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/StructDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (StructDef::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EnumDef:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_EnumDef::_nil ());
++ ACE_CHECK_RETURN (IR_StructDef::_nil ());
if (is_a == 0)
- return StructDef::_nil ();
-+ return IR_EnumDef::_nil ();
++ return IR_StructDef::_nil ();
}
- return StructDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_EnumDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_StructDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::StructDef_ptr IR::StructDef::_unchecked_narrow (
-+IR_EnumDef_ptr IR_EnumDef::_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_EnumDef::_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_EnumDef_ptr default_proxy = IR_EnumDef::_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_EnumDef_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_EnumDef (
++ ::IR_StructDef (
stub,
1,
obj->_servant ()),
- StructDef::_nil ());
-+ IR_EnumDef::_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_EnumDef (stub, 0, obj->_servant ()), IR_EnumDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_StructDef (stub, 0, obj->_servant ()), IR_StructDef::_nil ());
return default_proxy;
}
else
@@ -21236,14 +10121,14 @@
ACE_reinterpret_cast
(
- StructDef_ptr,
-+ IR_EnumDef_ptr,
++ IR_StructDef_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &StructDef::_narrow
-+ &IR_EnumDef::_narrow
++ &IR_StructDef::_narrow
)
)
);
@@ -21251,8 +10136,8 @@
-IR::StructDef_ptr
-IR::StructDef::_duplicate (StructDef_ptr obj)
-+IR_EnumDef_ptr
-+IR_EnumDef::_duplicate (IR_EnumDef_ptr obj)
++IR_StructDef_ptr
++IR_StructDef::_duplicate (IR_StructDef_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -21260,52 +10145,48 @@
}
-CORBA::Boolean IR::StructDef::_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)
++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/EnumDef: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")) ||
-@@ -17189,70 +10508,58 @@
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/StructDef:1.0")) ||
+@@ -17373,70 +16964,70 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::StructDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_EnumDef::_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_EnumDef::_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))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_TypedefDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
- &ACE_NESTED_CLASS (::IR, Container)::_narrow))
-+ &IR_TypedefDef::_narrow))
++ &IR_Container::_narrow))
retv = ACE_reinterpret_cast
(
void *,
ACE_static_cast
(
- IR::Container_ptr,
-+ IR_TypedefDef_ptr,
++ IR_Container_ptr,
this
)
);
@@ -21351,225 +10232,162 @@
this
)
);
-@@ -17265,181 +10572,64 @@
+@@ -17449,12 +17040,12 @@
return retv;
}
-const char* IR::StructDef::_interface_repository_id (void) const
-+const char* IR_EnumDef::_interface_repository_id (void) const
++const char* IR_StructDef::_interface_repository_id (void) const
{
-- return "IDL:omg.org/IR/StructDef:1.0";
-+ return "IDL:omg.org/IR/EnumDef:1.0";
+ return "IDL:omg.org/IR/StructDef:1.0";
}
-IR::StructMemberSeq * IR::StructDef::members (
-+IR_EnumMemberSeq * IR_EnumDef::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 (
-+ return this->the_TAO_EnumDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
- this,
- ACE_TRY_ENV
+@@ -17471,8 +17062,8 @@
);
}
-void IR::StructDef::members (
- const IR::StructMemberSeq & members,
-+void IR_EnumDef::members (
-+ const IR_EnumMemberSeq & 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->the_TAO_EnumDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
- this,
- members,
- ACE_TRY_ENV
+@@ -17490,9 +17081,8 @@
);
}
-+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 = 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)
-+TAO_NAMESPACE_END
-+
-+///////////////////////////////////////////////////////////////////////
-+// Base & Remote Proxy Implementation.
-+//
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::TAO_ClientRequestInfo_IR_StructDef_members_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-+_TAO_AliasDef_Proxy_Impl::_TAO_AliasDef_Proxy_Impl (void)
++IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::TAO_ClientRequestInfo_IR_StructDef_members_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -17501,7 +17091,7 @@
{}
--Dynamic::ParameterList *
+ Dynamic::ParameterList *
-IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -17513,7 +17103,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -17526,7 +17116,7 @@
+
+
+ CORBA::Any *
-IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -17542,16 +17132,16 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::TAO_ClientRequestInfo_IR_StructDef_members_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- const IR::StructMemberSeq & members,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- members_ (members)
--{}
--
--Dynamic::ParameterList *
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -17559,7 +17149,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_members = parameter_list->length ();
-- parameter_list->length (length_members + 1);
-- (*parameter_list)[length_members].argument <<= this->members_;
--
-- (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -17579,7 +17169,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -17592,7 +17182,7 @@
+
+
+ CORBA::Any *
-IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--#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
++IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -17605,13 +17195,14 @@
+ }
+
+ #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));
--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
--
--///////////////////////////////////////////////////////////////////////
--// Base & Remote Proxy Implementation.
--//
--
++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)
+@@ -17621,15 +17212,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_AliasDef_Remote_Proxy_Impl::_TAO_AliasDef_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 (
-+IR_IDLType_ptr _TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
++CORBA::TypeCode_ptr _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -17447,826 +10637,170 @@
+@@ -17637,16 +17228,13 @@
CORBA::SystemException
))
{
-
-- CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
-- CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
--
-+ IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
-+ IR_IDLType_var _tao_safe_retval (_tao_retval);
+ 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);
@@ -21577,191 +10395,26 @@
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
-- "_get_discriminator_type",
-- 23,
-+ "_get_original_type_def",
-+ 22,
- 0,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ "_get_discriminator_type",
+@@ -17667,7 +17255,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ 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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ 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)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -17789,7 +17377,7 @@
return _tao_safe_retval._retn ();
}
-IR::IDLType_ptr IR::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
-+void _TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
++IR_IDLType_ptr _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
CORBA_Object *_collocated_tao_target_,
-+ IR_IDLType_ptr original_type_def,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
+@@ -17797,16 +17385,13 @@
CORBA::SystemException
))
{
@@ -21769,837 +10422,295 @@
- 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);
-+ ACE_THROW (CORBA::INTERNAL ());
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
-- "_get_discriminator_type_def",
-- 27,
-- 0,
-+ "_set_original_type_def",
-+ 22,
-+ 1,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ "_get_discriminator_type_def",
+@@ -17827,7 +17412,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -17883,7 +17468,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-+ ACE_CHECK;
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << original_type_def)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
-
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
-+
-+ break;
-+ }
++ IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -17949,19 +17534,15 @@
+ return _tao_safe_retval._retn ();
}
-void IR::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
-- CORBA_Object *_collocated_tao_target_,
++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
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW (CORBA::INTERNAL ());
-+//
-+// End Base & Remote Proxy Implemeentation.
-+///////////////////////////////////////////////////////////////////////
-
++ IR_IDLType_ptr discriminator_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
-
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_set_discriminator_type_def",
-- 27,
-- 1,
-- istub->orb_core ()
-- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
+-
-
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -17987,7 +17568,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- discriminator_type_def,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << discriminator_type_def)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+///////////////////////////////////////////////////////////////////////
-+// Remote & Base Proxy Broker Implementation
-+//
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
-+_TAO_AliasDef_Proxy_Broker::_TAO_AliasDef_Proxy_Broker (void)
-+{
++ IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ discriminator_type_def,
+@@ -18101,7 +17682,7 @@
+
}
-IR::UnionMemberSeq * IR::_TAO_UnionDef_Remote_Proxy_Impl::members (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+_TAO_AliasDef_Proxy_Broker::~_TAO_AliasDef_Proxy_Broker (void)
++IR_UnionMemberSeq * _TAO_UnionDef_Remote_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -18109,17 +17690,14 @@
+ CORBA::SystemException
+ ))
{
-
- IR::UnionMemberSeq *_tao_retval = 0;
-
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 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);
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_get_members",
-- 12,
-- 0,
-- istub->orb_core ()
-- );
-+// Factory function Implementation.
-+_TAO_AliasDef_Remote_Proxy_Broker *the_TAO_AliasDef_Remote_Proxy_Broker (void)
-+{
-+ static ::_TAO_AliasDef_Remote_Proxy_Broker remote_proxy_broker;
-+ return &remote_proxy_broker;
-+}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ 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",
+@@ -18140,7 +17718,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -18196,7 +17774,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::UnionMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+_TAO_AliasDef_Remote_Proxy_Broker::_TAO_AliasDef_Remote_Proxy_Broker (void)
-+{
-+}
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
-+_TAO_AliasDef_Remote_Proxy_Broker::~_TAO_AliasDef_Remote_Proxy_Broker (void)
-+{
++ IR_UnionMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -18262,19 +17840,15 @@
+ return _tao_safe_retval._retn ();
}
-void IR::_TAO_UnionDef_Remote_Proxy_Impl::members (
-- CORBA_Object *_collocated_tao_target_,
++void _TAO_UnionDef_Remote_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
- const IR::UnionMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+_TAO_AliasDef_Proxy_Impl&
-+_TAO_AliasDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_AliasDef *object,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
++ 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 ());
--
--
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_set_members",
-- 12,
-- 1,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -18300,7 +17874,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- members,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << members)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
--}
--
--
--//
--// End Base & Remote Proxy Implemeentation.
--///////////////////////////////////////////////////////////////////////
--
--
--///////////////////////////////////////////////////////////////////////
--// Remote & Base Proxy Broker Implementation
--//
--
++ IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ members,
+@@ -18424,37 +17998,37 @@
+ // 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)
--{
--}
--
--// Factory Member function Implementation.
--IR::_TAO_UnionDef_Remote_Proxy_Broker *IR::_TAO_UnionDef_Remote_Proxy_Broker::the_TAO_UnionDef_Remote_Proxy_Broker (void)
--{
++_TAO_UnionDef_Proxy_Broker::~_TAO_UnionDef_Proxy_Broker (void)
+ {
+ }
+
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_UnionDef_Remote_Proxy_Broker *
+-IR::_TAO_UnionDef_Remote_Proxy_Broker::the_TAO_UnionDef_Remote_Proxy_Broker (void)
++_TAO_UnionDef_Remote_Proxy_Broker *
++_TAO_UnionDef_Remote_Proxy_Broker::the_TAO_UnionDef_Remote_Proxy_Broker (void)
+ {
- static ::IR::_TAO_UnionDef_Remote_Proxy_Broker remote_proxy_broker;
-- return &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,
-- CORBA::Environment &ACE_TRY_ENV
--)
--{
-- ACE_UNUSED_ARG (object);
-- ACE_UNUSED_ARG (ACE_TRY_ENV);
-- return remote_proxy_impl_;
--}
-+ ACE_UNUSED_ARG (object);
-+ ACE_UNUSED_ARG (ACE_TRY_ENV);
-+ return remote_proxy_impl_;
-+}
-
-
- //
-@@ -18275,115 +10809,114 @@
++_TAO_UnionDef_Proxy_Impl&
++_TAO_UnionDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_UnionDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -18470,111 +18044,110 @@
// default constructor
-IR::UnionDef::UnionDef (int collocated)
-+IR_AliasDef::IR_AliasDef (int collocated)
++IR_UnionDef::IR_UnionDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_UnionDef_setup_collocation (collocated);
}
// destructor
-IR::UnionDef::~UnionDef (void)
-+IR_AliasDef::~IR_AliasDef (void)
++IR_UnionDef::~IR_UnionDef (void)
{}
void
--IR::UnionDef::_tao_setup_collocation (int collocated)
-+IR_AliasDef::_tao_setup_collocation (int collocated)
+-IR::UnionDef::IR_UnionDef_setup_collocation (int collocated)
++IR_UnionDef::IR_UnionDef_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_UnionDef_Proxy_Broker_ =
+ this->the_TAO_UnionDef_Proxy_Broker_ =
- ::IR__TAO_UnionDef_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_AliasDef_Proxy_Broker_ =
-+ _TAO_AliasDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_UnionDef_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_UnionDef_Proxy_Broker_ =
+ this->the_TAO_UnionDef_Proxy_Broker_ =
- ::IR::_TAO_UnionDef_Remote_Proxy_Broker::the_TAO_UnionDef_Remote_Proxy_Broker ();
-+ this->the_TAO_AliasDef_Proxy_Broker_ =
-+ ::the_TAO_AliasDef_Remote_Proxy_Broker ();
-+
-+ IR_TypedefDef::_tao_setup_collocation (collocated);
++ _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);
+ this->IR_TypedefDef_setup_collocation (collocated);
+-
+ this->IR_Container_setup_collocation (collocated);
}
-void IR::UnionDef::_tao_any_destructor (void *x)
-+void IR_AliasDef::_tao_any_destructor (void *x)
++void IR_UnionDef::_tao_any_destructor (void *x)
{
- UnionDef *tmp = ACE_static_cast (UnionDef*,x);
-+ IR_AliasDef *tmp = ACE_static_cast (IR_AliasDef*,x);
++ IR_UnionDef *tmp = ACE_static_cast (IR_UnionDef*,x);
CORBA::release (tmp);
}
-IR::UnionDef_ptr IR::UnionDef::_narrow (
-+IR_AliasDef_ptr IR_AliasDef::_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_AliasDef::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/UnionDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (UnionDef::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/AliasDef:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_AliasDef::_nil ());
++ ACE_CHECK_RETURN (IR_UnionDef::_nil ());
if (is_a == 0)
- return UnionDef::_nil ();
-+ return IR_AliasDef::_nil ();
++ return IR_UnionDef::_nil ();
}
- return UnionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_AliasDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_UnionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::UnionDef_ptr IR::UnionDef::_unchecked_narrow (
-+IR_AliasDef_ptr IR_AliasDef::_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_AliasDef::_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_AliasDef_ptr default_proxy = IR_AliasDef::_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_AliasDef_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_AliasDef (
++ ::IR_UnionDef (
stub,
1,
obj->_servant ()),
- UnionDef::_nil ());
-+ IR_AliasDef::_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_AliasDef (stub, 0, obj->_servant ()), IR_AliasDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_UnionDef (stub, 0, obj->_servant ()), IR_UnionDef::_nil ());
return default_proxy;
}
else
@@ -22607,14 +10718,14 @@
ACE_reinterpret_cast
(
- UnionDef_ptr,
-+ IR_AliasDef_ptr,
++ IR_UnionDef_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &UnionDef::_narrow
-+ &IR_AliasDef::_narrow
++ &IR_UnionDef::_narrow
)
)
);
@@ -22622,8 +10733,8 @@
-IR::UnionDef_ptr
-IR::UnionDef::_duplicate (UnionDef_ptr obj)
-+IR_AliasDef_ptr
-+IR_AliasDef::_duplicate (IR_AliasDef_ptr obj)
++IR_UnionDef_ptr
++IR_UnionDef::_duplicate (IR_UnionDef_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -22631,28 +10742,22 @@
}
-CORBA::Boolean IR::UnionDef::_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)
++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/AliasDef: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")) ||
-@@ -18393,70 +10926,58 @@
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/UnionDef:1.0")) ||
+@@ -18589,70 +18162,70 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::UnionDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_AliasDef::_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_AliasDef::_narrow))
++ &IR_UnionDef::_narrow))
retv = ACE_reinterpret_cast (void*, this);
else if (type == ACE_reinterpret_cast
(ptr_arith_t,
@@ -22671,1184 +10776,584 @@
else if (type == ACE_reinterpret_cast
(ptr_arith_t,
- &ACE_NESTED_CLASS (::IR, Container)::_narrow))
-+ &IR_Contained::_narrow))
++ &IR_Container::_narrow))
retv = ACE_reinterpret_cast
(
void *,
ACE_static_cast
(
- IR::Container_ptr,
-+ IR_Contained_ptr,
++ IR_Container_ptr,
this
)
);
else if (type == ACE_reinterpret_cast
(ptr_arith_t,
- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+ &IR_IDLType::_narrow))
++ &IR_Contained::_narrow))
retv = ACE_reinterpret_cast
(
void *,
ACE_static_cast
(
- IR::Contained_ptr,
-+ IR_IDLType_ptr,
++ IR_Contained_ptr,
this
)
);
else if (type == ACE_reinterpret_cast
(ptr_arith_t,
- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-+ &CORBA_IRObject::_narrow))
++ &IR_IDLType::_narrow))
retv = ACE_reinterpret_cast
(
void *,
ACE_static_cast
(
- IR::IDLType_ptr,
-- this
-- )
-- );
-- else if (type == ACE_reinterpret_cast
-- (ptr_arith_t,
++ 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::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
- CORBA::IRObject_ptr,
+ CORBA_IRObject_ptr,
this
)
);
-@@ -18469,393 +10990,325 @@
+@@ -18665,12 +18238,12 @@
return retv;
}
-const char* IR::UnionDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/UnionDef:1.0";
--}
--
++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::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
-- );
--}
--
++CORBA::TypeCode_ptr IR_UnionDef::discriminator_type (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -18687,7 +18260,7 @@
+ );
+ }
+
-IR::IDLType_ptr IR::UnionDef::discriminator_type_def (
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+const char* IR_AliasDef::_interface_repository_id (void) const
- {
--
-- return this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).discriminator_type_def (
-- this,
-- ACE_TRY_ENV
-- );
-+ return "IDL:omg.org/IR/AliasDef:1.0";
++IR_IDLType_ptr IR_UnionDef::discriminator_type_def (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -18704,8 +18277,8 @@
+ );
}
-void IR::UnionDef::discriminator_type_def (
- IR::IDLType_ptr discriminator_type_def,
-+IR_IDLType_ptr IR_AliasDef::original_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 (
-+ return this->the_TAO_AliasDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).original_type_def (
- this,
-- discriminator_type_def,
- ACE_TRY_ENV
+@@ -18723,7 +18296,7 @@
);
}
-IR::UnionMemberSeq * IR::UnionDef::members (
-+void IR_AliasDef::original_type_def (
-+ IR_IDLType_ptr original_type_def,
++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->the_TAO_AliasDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).original_type_def (
- this,
-+ original_type_def,
- ACE_TRY_ENV
+@@ -18740,8 +18313,8 @@
);
}
-void IR::UnionDef::members (
- const IR::UnionMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+static const CORBA::Long _oc_IR_AliasDef[] =
- {
--
-- this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
-- this,
-- members,
-- ACE_TRY_ENV
-- );
--}
-+ 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 = 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)
-+TAO_NAMESPACE_END
-
-+///////////////////////////////////////////////////////////////////////
-+// Base & Remote Proxy Implementation.
-+//
++void IR_UnionDef::members (
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -18759,9 +18332,8 @@
+ );
+ }
--#if (TAO_HAS_INTERCEPTORS == 1)
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-+_TAO_NativeDef_Proxy_Impl::_TAO_NativeDef_Proxy_Impl (void)
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -18770,7 +18342,7 @@
{}
--Dynamic::ParameterList *
+ Dynamic::ParameterList *
-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -18782,7 +18354,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -18795,7 +18367,7 @@
+
+
+ CORBA::Any *
-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
-+_TAO_NativeDef_Remote_Proxy_Impl::_TAO_NativeDef_Remote_Proxy_Impl (void)
-+{}
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -18811,13 +18383,13 @@
+ }
--void
+ void
-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::result (CORBA::TypeCode_ptr result)
--{
-- // update the result
-- this->_result = result;
--}
-+// Remote Implementation of the IDL interface methods
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
-
--Dynamic::ParameterList *
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -18826,7 +18398,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+//
-+// End Base & Remote Proxy Implemeentation.
-+///////////////////////////////////////////////////////////////////////
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -18838,7 +18410,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -18851,7 +18423,7 @@
-+///////////////////////////////////////////////////////////////////////
-+// Remote & Base Proxy Broker Implementation
-+//
--CORBA::Any *
+ CORBA::Any *
-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+_TAO_NativeDef_Proxy_Broker::_TAO_NativeDef_Proxy_Broker (void)
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
+ // Generate the result on demand.
+@@ -18867,16 +18439,16 @@
}
--void
+ void
-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::result (IR::IDLType_ptr result)
-+_TAO_NativeDef_Proxy_Broker::~_TAO_NativeDef_Proxy_Broker (void)
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::result (IR_IDLType_ptr result)
{
-- // update the result
-- this->_result = 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- IR::IDLType_ptr discriminator_type_def,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- discriminator_type_def_ (discriminator_type_def)
--{}
--
--Dynamic::ParameterList *
++ IR_IDLType_ptr discriminator_type_def,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -18884,7 +18456,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+// Factory function Implementation.
-+_TAO_NativeDef_Remote_Proxy_Broker *the_TAO_NativeDef_Remote_Proxy_Broker (void)
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_discriminator_type_def = parameter_list->length ();
-- parameter_list->length (length_discriminator_type_def + 1);
-- (*parameter_list)[length_discriminator_type_def].argument <<= this->discriminator_type_def_;
--
-- (*parameter_list)[length_discriminator_type_def].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ static ::_TAO_NativeDef_Remote_Proxy_Broker remote_proxy_broker;
-+ return &remote_proxy_broker;
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -18904,7 +18476,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+_TAO_NativeDef_Remote_Proxy_Broker::_TAO_NativeDef_Remote_Proxy_Broker (void)
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
- }
+ // Generate the exception list on demand.
+@@ -18917,7 +18489,7 @@
--
--CORBA::Any *
+
+ CORBA::Any *
-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+_TAO_NativeDef_Remote_Proxy_Broker::~_TAO_NativeDef_Remote_Proxy_Broker (void)
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
+ // Generate the result on demand.
+@@ -18929,7 +18501,7 @@
+ return result_any;
}
-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::TAO_ClientRequestInfo_IR_UnionDef_members_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::TAO_ClientRequestInfo_IR_UnionDef_members_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -18938,7 +18510,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+_TAO_NativeDef_Proxy_Impl&
-+_TAO_NativeDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_NativeDef *object,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
-+ ACE_UNUSED_ARG (object);
-+ ACE_UNUSED_ARG (ACE_TRY_ENV);
-+ return remote_proxy_impl_;
+ // Generate the argument list on demand.
+@@ -18950,7 +18522,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -18963,7 +18535,7 @@
-+//
-+// End Remote & Base Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
--CORBA::Any *
+ CORBA::Any *
-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -18979,16 +18551,16 @@
+ }
--void
+ void
-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::result (IR::UnionMemberSeq * result)
-+// default constructor
-+IR_NativeDef::IR_NativeDef (int collocated)
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::result (IR_UnionMemberSeq * result)
{
-- // update the result
-- this->_result = result;
-+ this->_tao_setup_collocation (collocated);
+ // update the result
+ this->_result = result;
}
-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::TAO_ClientRequestInfo_IR_UnionDef_members_set (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::TAO_ClientRequestInfo_IR_UnionDef_members_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- const IR::UnionMemberSeq & members,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- members_ (members)
-+// destructor
-+IR_NativeDef::~IR_NativeDef (void)
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -18996,7 +18568,7 @@
{}
--Dynamic::ParameterList *
+ Dynamic::ParameterList *
-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void
-+IR_NativeDef::_tao_setup_collocation (int collocated)
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_members = parameter_list->length ();
-- parameter_list->length (length_members + 1);
-- (*parameter_list)[length_members].argument <<= this->members_;
-+ 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 ();
-
-- (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
-+ IR_TypedefDef::_tao_setup_collocation (collocated);
-
-- return safe_parameter_list._retn ();
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -19016,7 +18588,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void IR_NativeDef::_tao_any_destructor (void *x)
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ IR_NativeDef *tmp = ACE_static_cast (IR_NativeDef*,x);
-+ CORBA::release (tmp);
- }
+ // Generate the exception list on demand.
+@@ -19029,7 +18601,7 @@
--
--CORBA::Any *
+
+ CORBA::Any *
-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR_NativeDef_ptr IR_NativeDef::_narrow (
-+ CORBA::Object_ptr obj,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
-+ if (CORBA::is_nil (obj))
-+ 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);
++IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -19042,13 +18614,14 @@
}
--#endif /* TAO_HAS_INTERCEPTORS */
--static const CORBA::Long _oc_IR_UnionDef[] =
-+IR_NativeDef_ptr IR_NativeDef::_unchecked_narrow (
-+ CORBA::Object_ptr obj,
-+ CORBA::Environment &
-+ )
+ #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
+ 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));
--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
-+ if (CORBA::is_nil (obj))
-+ return IR_NativeDef::_nil ();
-+ if (! obj->_is_local ())
-+ {
-+ TAO_Stub* stub = obj->_stubobj ();
-+ if (stub)
-+ stub->_incr_refcnt ();
-+ IR_NativeDef_ptr default_proxy = IR_NativeDef::_nil ();
-
--///////////////////////////////////////////////////////////////////////
--// Base & Remote Proxy Implementation.
-+ 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
-+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)
-+{
-+ if (
-+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/NativeDef: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_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;
-+}
-+
-+const char* IR_NativeDef::_interface_repository_id (void) const
-+{
-+ return "IDL:omg.org/IR/NativeDef:1.0";
-+}
-+
-+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 = 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)
-+TAO_NAMESPACE_END
-+
-+///////////////////////////////////////////////////////////////////////
-+// Base & Remote Proxy Implementation.
++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)
+@@ -19058,15 +18631,15 @@
+ // Base & Remote Proxy Implementation.
//
-IR::_TAO_EnumDef_Proxy_Impl::_TAO_EnumDef_Proxy_Impl (void)
-+_TAO_PrimitiveDef_Proxy_Impl::_TAO_PrimitiveDef_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_PrimitiveDef_Remote_Proxy_Impl::_TAO_PrimitiveDef_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_PrimitiveKind _TAO_PrimitiveDef_Remote_Proxy_Impl::kind (
++IR_EnumMemberSeq * _TAO_EnumDef_Remote_Proxy_Impl::members (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -18863,309 +11316,62 @@
+@@ -19074,17 +18647,14 @@
CORBA::SystemException
))
{
-
- IR::EnumMemberSeq *_tao_retval = 0;
-
-+ IR_PrimitiveKind _tao_retval = (IR_PrimitiveKind)0;
++ IR_EnumMemberSeq *_tao_retval = 0;
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+ 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",
-- 12,
-+ "_get_kind",
-+ 9,
- 0,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ "_get_members",
+@@ -19105,7 +18675,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -19161,7 +18731,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::EnumMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ ACE_CHECK_RETURN (_tao_retval);
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
--
++ IR_EnumMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -19227,24 +18797,19 @@
+ return _tao_safe_retval._retn ();
+ }
+
-void IR::_TAO_EnumDef_Remote_Proxy_Impl::members (
-- CORBA_Object *_collocated_tao_target_,
++void _TAO_EnumDef_Remote_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
- 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 ());
--
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
-
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_set_members",
-- 12,
-- 1,
-- istub->orb_core ()
-- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- members,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << members)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ _tao_retval
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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
-+ );
-+ }
-+ break;
-+ }
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-
-+ return _tao_retval;
- }
-
-
-@@ -19178,32 +11384,32 @@
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_members",
+@@ -19265,7 +18830,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
+- IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set ri (
++ IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ members,
+@@ -19389,37 +18954,37 @@
// Remote & Base Proxy Broker Implementation
//
-IR::_TAO_EnumDef_Proxy_Broker::_TAO_EnumDef_Proxy_Broker (void)
-+_TAO_PrimitiveDef_Proxy_Broker::_TAO_PrimitiveDef_Proxy_Broker (void)
++_TAO_EnumDef_Proxy_Broker::_TAO_EnumDef_Proxy_Broker (void)
{
}
-IR::_TAO_EnumDef_Proxy_Broker::~_TAO_EnumDef_Proxy_Broker (void)
-+_TAO_PrimitiveDef_Proxy_Broker::~_TAO_PrimitiveDef_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_PrimitiveDef_Remote_Proxy_Broker *the_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_EnumDef_Remote_Proxy_Broker *
+-IR::_TAO_EnumDef_Remote_Proxy_Broker::the_TAO_EnumDef_Remote_Proxy_Broker (void)
++_TAO_EnumDef_Remote_Proxy_Broker *
++_TAO_EnumDef_Remote_Proxy_Broker::the_TAO_EnumDef_Remote_Proxy_Broker (void)
{
- static ::IR::_TAO_EnumDef_Remote_Proxy_Broker remote_proxy_broker;
-+ static ::_TAO_PrimitiveDef_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_PrimitiveDef_Remote_Proxy_Broker::_TAO_PrimitiveDef_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_PrimitiveDef_Remote_Proxy_Broker::~_TAO_PrimitiveDef_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_PrimitiveDef_Proxy_Impl&
-+_TAO_PrimitiveDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_PrimitiveDef *object,
++_TAO_EnumDef_Proxy_Impl&
++_TAO_EnumDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_EnumDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -19219,114 +11425,113 @@
+@@ -19435,109 +19000,109 @@
// default constructor
-IR::EnumDef::EnumDef (int collocated)
-+IR_PrimitiveDef::IR_PrimitiveDef (int collocated)
++IR_EnumDef::IR_EnumDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_EnumDef_setup_collocation (collocated);
}
// destructor
-IR::EnumDef::~EnumDef (void)
-+IR_PrimitiveDef::~IR_PrimitiveDef (void)
++IR_EnumDef::~IR_EnumDef (void)
{}
void
--IR::EnumDef::_tao_setup_collocation (int collocated)
-+IR_PrimitiveDef::_tao_setup_collocation (int collocated)
+-IR::EnumDef::IR_EnumDef_setup_collocation (int collocated)
++IR_EnumDef::IR_EnumDef_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_EnumDef_Proxy_Broker_ =
+ this->the_TAO_EnumDef_Proxy_Broker_ =
- ::IR__TAO_EnumDef_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_PrimitiveDef_Proxy_Broker_ =
-+ _TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_EnumDef_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_EnumDef_Proxy_Broker_ =
+ this->the_TAO_EnumDef_Proxy_Broker_ =
- ::IR::_TAO_EnumDef_Remote_Proxy_Broker::the_TAO_EnumDef_Remote_Proxy_Broker ();
-+ this->the_TAO_PrimitiveDef_Proxy_Broker_ =
-+ ::the_TAO_PrimitiveDef_Remote_Proxy_Broker ();
-+
-+ IR_IDLType::_tao_setup_collocation (collocated);
++ _TAO_EnumDef_Remote_Proxy_Broker::the_TAO_EnumDef_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (IR, TypedefDef)::_tao_setup_collocation (collocated);
+ this->IR_TypedefDef_setup_collocation (collocated);
}
-void IR::EnumDef::_tao_any_destructor (void *x)
-+void IR_PrimitiveDef::_tao_any_destructor (void *x)
++void IR_EnumDef::_tao_any_destructor (void *x)
{
- EnumDef *tmp = ACE_static_cast (EnumDef*,x);
-+ IR_PrimitiveDef *tmp = ACE_static_cast (IR_PrimitiveDef*,x);
++ IR_EnumDef *tmp = ACE_static_cast (IR_EnumDef*,x);
CORBA::release (tmp);
}
-IR::EnumDef_ptr IR::EnumDef::_narrow (
-+IR_PrimitiveDef_ptr IR_PrimitiveDef::_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_PrimitiveDef::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EnumDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (EnumDef::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PrimitiveDef:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_PrimitiveDef::_nil ());
++ ACE_CHECK_RETURN (IR_EnumDef::_nil ());
if (is_a == 0)
- return EnumDef::_nil ();
-+ return IR_PrimitiveDef::_nil ();
++ return IR_EnumDef::_nil ();
}
- return EnumDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_PrimitiveDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_EnumDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::EnumDef_ptr IR::EnumDef::_unchecked_narrow (
-+IR_PrimitiveDef_ptr IR_PrimitiveDef::_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_PrimitiveDef::_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_PrimitiveDef_ptr default_proxy = IR_PrimitiveDef::_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_PrimitiveDef_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_PrimitiveDef (
++ ::IR_EnumDef (
stub,
1,
obj->_servant ()),
- EnumDef::_nil ());
-+ IR_PrimitiveDef::_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_PrimitiveDef (stub, 0, obj->_servant ()), IR_PrimitiveDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_EnumDef (stub, 0, obj->_servant ()), IR_EnumDef::_nil ());
return default_proxy;
}
else
@@ -23856,14 +11361,14 @@
ACE_reinterpret_cast
(
- EnumDef_ptr,
-+ IR_PrimitiveDef_ptr,
++ IR_EnumDef_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &EnumDef::_narrow
-+ &IR_PrimitiveDef::_narrow
++ &IR_EnumDef::_narrow
)
)
);
@@ -23871,8 +11376,8 @@
-IR::EnumDef_ptr
-IR::EnumDef::_duplicate (EnumDef_ptr obj)
-+IR_PrimitiveDef_ptr
-+IR_PrimitiveDef::_duplicate (IR_PrimitiveDef_ptr obj)
++IR_EnumDef_ptr
++IR_EnumDef::_duplicate (IR_EnumDef_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -23880,55 +11385,53 @@
}
-CORBA::Boolean IR::EnumDef::_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)
++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/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")))
-@@ -19335,58 +11540,34 @@
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EnumDef:1.0")) ||
+@@ -19551,58 +19116,58 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::EnumDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_PrimitiveDef::_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_PrimitiveDef::_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))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_TypedefDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_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
@@ -23955,201 +11458,154 @@
this
)
);
-@@ -19399,181 +11580,49 @@
+@@ -19615,12 +19180,12 @@
return retv;
}
-const char* IR::EnumDef::_interface_repository_id (void) const
-+const char* IR_PrimitiveDef::_interface_repository_id (void) const
++const char* IR_EnumDef::_interface_repository_id (void) const
{
-- return "IDL:omg.org/IR/EnumDef:1.0";
-+ return "IDL:omg.org/IR/PrimitiveDef:1.0";
+ return "IDL:omg.org/IR/EnumDef:1.0";
}
-IR::EnumMemberSeq * IR::EnumDef::members (
-+IR_PrimitiveKind IR_PrimitiveDef::kind (
++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 (
-+ return this->the_TAO_PrimitiveDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).kind (
- this,
- ACE_TRY_ENV
+@@ -19637,8 +19202,8 @@
);
}
-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,
-- ACE_TRY_ENV
-- );
--}
--
++void IR_EnumDef::members (
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -19656,9 +19221,8 @@
+ );
+ }
+
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::TAO_ClientRequestInfo_IR_EnumDef_members_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::TAO_ClientRequestInfo_IR_EnumDef_members_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -19667,7 +19231,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -19679,7 +19243,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -19692,7 +19256,7 @@
+
+
+ CORBA::Any *
-IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -19708,16 +19272,16 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::TAO_ClientRequestInfo_IR_EnumDef_members_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- const IR::EnumMemberSeq & members,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- members_ (members)
--{}
--
--Dynamic::ParameterList *
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -19725,7 +19289,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_members = parameter_list->length ();
-- parameter_list->length (length_members + 1);
-- (*parameter_list)[length_members].argument <<= this->members_;
--
-- (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -19745,7 +19309,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -19758,7 +19322,7 @@
+
+
+ CORBA::Any *
-IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--#endif /* TAO_HAS_INTERCEPTORS */
--static const CORBA::Long _oc_IR_EnumDef[] =
-+static const CORBA::Long _oc_IR_PrimitiveDef[] =
++IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -19771,13 +19335,14 @@
+ }
+
+ #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
+ 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
-+ 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 = IR_PrimitiveDef
++ 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_PrimitiveDef (CORBA::tk_objref, sizeof (_oc_IR_PrimitiveDef), (char *) &_oc_IR_PrimitiveDef, 0, sizeof (IR_PrimitiveDef));
++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)
-+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrimitiveDef, &_tc_TAO_tc_IR_PrimitiveDef)
- TAO_NAMESPACE_END
-
- ///////////////////////////////////////////////////////////////////////
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EnumDef, &_tc_TAO_tc_IR_EnumDef)
+@@ -19787,15 +19352,15 @@
// Base & Remote Proxy Implementation.
//
-IR::_TAO_AliasDef_Proxy_Impl::_TAO_AliasDef_Proxy_Impl (void)
-+_TAO_StringDef_Proxy_Impl::_TAO_StringDef_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_StringDef_Remote_Proxy_Impl::_TAO_StringDef_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 (
-+CORBA::ULong _TAO_StringDef_Remote_Proxy_Impl::bound (
++IR_IDLType_ptr _TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -19581,308 +11630,124 @@
+@@ -19803,16 +19368,13 @@
CORBA::SystemException
))
{
@@ -24157,200 +11613,44 @@
- IR::IDLType_ptr _tao_retval = IR::IDLType::_nil ();
- IR::IDLType_var _tao_safe_retval (_tao_retval);
-
-+ CORBA::ULong _tao_retval = 0;
++ 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);
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
-- "_get_original_type_def",
-- 22,
-+ "_get_bound",
-+ 10,
- 0,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ "_get_original_type_def",
+@@ -19833,7 +19395,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -19889,7 +19451,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ ACE_CHECK_RETURN (_tao_retval);
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ _tao_retval
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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
-+ );
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
-+ return _tao_retval;
++ IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -19955,24 +19517,19 @@
+ return _tao_safe_retval._retn ();
}
-void IR::_TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
-+void _TAO_StringDef_Remote_Proxy_Impl::bound (
++void _TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
CORBA_Object *_collocated_tao_target_,
- IR::IDLType_ptr original_type_def,
-+ CORBA::ULong bound,
++ IR_IDLType_ptr original_type_def,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
@@ -24368,321 +11668,164 @@
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
-- "_set_original_type_def",
-- 22,
-+ "_set_bound",
-+ 10,
- 1,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- original_type_def,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << original_type_def)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-+ ACE_CHECK;
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << bound)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
+ "_set_original_type_def",
+@@ -19993,7 +19550,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
- }
--
-- break;
-- }
--
-+
-+ break;
-+ }
- }
-
-
-@@ -19895,32 +11760,32 @@
+ #if TAO_HAS_INTERCEPTORS == 1
+- IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set ri (
++ IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ original_type_def,
+@@ -20117,37 +19674,37 @@
// Remote & Base Proxy Broker Implementation
//
-IR::_TAO_AliasDef_Proxy_Broker::_TAO_AliasDef_Proxy_Broker (void)
-+_TAO_StringDef_Proxy_Broker::_TAO_StringDef_Proxy_Broker (void)
++_TAO_AliasDef_Proxy_Broker::_TAO_AliasDef_Proxy_Broker (void)
{
}
-IR::_TAO_AliasDef_Proxy_Broker::~_TAO_AliasDef_Proxy_Broker (void)
-+_TAO_StringDef_Proxy_Broker::~_TAO_StringDef_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_StringDef_Remote_Proxy_Broker *the_TAO_StringDef_Remote_Proxy_Broker (void)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_AliasDef_Remote_Proxy_Broker *
+-IR::_TAO_AliasDef_Remote_Proxy_Broker::the_TAO_AliasDef_Remote_Proxy_Broker (void)
++_TAO_AliasDef_Remote_Proxy_Broker *
++_TAO_AliasDef_Remote_Proxy_Broker::the_TAO_AliasDef_Remote_Proxy_Broker (void)
{
- static ::IR::_TAO_AliasDef_Remote_Proxy_Broker remote_proxy_broker;
-+ static ::_TAO_StringDef_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_StringDef_Remote_Proxy_Broker::_TAO_StringDef_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_StringDef_Remote_Proxy_Broker::~_TAO_StringDef_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_StringDef_Proxy_Impl&
-+_TAO_StringDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_StringDef *object,
++_TAO_AliasDef_Proxy_Impl&
++_TAO_AliasDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_AliasDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -19936,114 +11801,113 @@
+@@ -20163,109 +19720,109 @@
// default constructor
-IR::AliasDef::AliasDef (int collocated)
-+IR_StringDef::IR_StringDef (int collocated)
++IR_AliasDef::IR_AliasDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_AliasDef_setup_collocation (collocated);
}
// destructor
-IR::AliasDef::~AliasDef (void)
-+IR_StringDef::~IR_StringDef (void)
++IR_AliasDef::~IR_AliasDef (void)
{}
void
--IR::AliasDef::_tao_setup_collocation (int collocated)
-+IR_StringDef::_tao_setup_collocation (int collocated)
+-IR::AliasDef::IR_AliasDef_setup_collocation (int collocated)
++IR_AliasDef::IR_AliasDef_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_AliasDef_Proxy_Broker_ =
+ this->the_TAO_AliasDef_Proxy_Broker_ =
- ::IR__TAO_AliasDef_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_StringDef_Proxy_Broker_ =
-+ _TAO_StringDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_AliasDef_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_AliasDef_Proxy_Broker_ =
+ this->the_TAO_AliasDef_Proxy_Broker_ =
- ::IR::_TAO_AliasDef_Remote_Proxy_Broker::the_TAO_AliasDef_Remote_Proxy_Broker ();
-+ this->the_TAO_StringDef_Proxy_Broker_ =
-+ ::the_TAO_StringDef_Remote_Proxy_Broker ();
-+
-+ IR_IDLType::_tao_setup_collocation (collocated);
++ _TAO_AliasDef_Remote_Proxy_Broker::the_TAO_AliasDef_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (IR, TypedefDef)::_tao_setup_collocation (collocated);
+ this->IR_TypedefDef_setup_collocation (collocated);
}
-void IR::AliasDef::_tao_any_destructor (void *x)
-+void IR_StringDef::_tao_any_destructor (void *x)
++void IR_AliasDef::_tao_any_destructor (void *x)
{
- AliasDef *tmp = ACE_static_cast (AliasDef*,x);
-+ IR_StringDef *tmp = ACE_static_cast (IR_StringDef*,x);
++ IR_AliasDef *tmp = ACE_static_cast (IR_AliasDef*,x);
CORBA::release (tmp);
}
-IR::AliasDef_ptr IR::AliasDef::_narrow (
-+IR_StringDef_ptr IR_StringDef::_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_StringDef::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/AliasDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (AliasDef::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/StringDef:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_StringDef::_nil ());
++ ACE_CHECK_RETURN (IR_AliasDef::_nil ());
if (is_a == 0)
- return AliasDef::_nil ();
-+ return IR_StringDef::_nil ();
++ return IR_AliasDef::_nil ();
}
- return AliasDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_StringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_AliasDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::AliasDef_ptr IR::AliasDef::_unchecked_narrow (
-+IR_StringDef_ptr IR_StringDef::_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_StringDef::_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_StringDef_ptr default_proxy = IR_StringDef::_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_StringDef_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_StringDef (
++ ::IR_AliasDef (
stub,
1,
obj->_servant ()),
- AliasDef::_nil ());
-+ IR_StringDef::_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_StringDef (stub, 0, obj->_servant ()), IR_StringDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_AliasDef (stub, 0, obj->_servant ()), IR_AliasDef::_nil ());
return default_proxy;
}
else
@@ -24690,14 +11833,14 @@
ACE_reinterpret_cast
(
- AliasDef_ptr,
-+ IR_StringDef_ptr,
++ IR_AliasDef_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &AliasDef::_narrow
-+ &IR_StringDef::_narrow
++ &IR_AliasDef::_narrow
)
)
);
@@ -24705,8 +11848,8 @@
-IR::AliasDef_ptr
-IR::AliasDef::_duplicate (AliasDef_ptr obj)
-+IR_StringDef_ptr
-+IR_StringDef::_duplicate (IR_StringDef_ptr obj)
++IR_AliasDef_ptr
++IR_AliasDef::_duplicate (IR_AliasDef_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -24714,55 +11857,53 @@
}
-CORBA::Boolean IR::AliasDef::_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)
++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/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")))
-@@ -20052,58 +11916,34 @@
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/AliasDef:1.0")) ||
+@@ -20279,58 +19836,58 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::AliasDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_StringDef::_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_StringDef::_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))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_TypedefDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_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
@@ -24789,496 +11930,295 @@
this
)
);
-@@ -20116,216 +11956,227 @@
+@@ -20343,12 +19900,12 @@
return retv;
}
-const char* IR::AliasDef::_interface_repository_id (void) const
-+const char* IR_StringDef::_interface_repository_id (void) const
++const char* IR_AliasDef::_interface_repository_id (void) const
{
-- return "IDL:omg.org/IR/AliasDef:1.0";
-+ return "IDL:omg.org/IR/StringDef:1.0";
+ return "IDL:omg.org/IR/AliasDef:1.0";
}
-IR::IDLType_ptr IR::AliasDef::original_type_def (
-+CORBA::ULong IR_StringDef::bound (
++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 (
-+ return this->the_TAO_StringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).bound (
- this,
- ACE_TRY_ENV
+@@ -20365,8 +19922,8 @@
);
}
-void IR::AliasDef::original_type_def (
- IR::IDLType_ptr original_type_def,
-+void IR_StringDef::bound (
-+ CORBA::ULong bound,
++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->the_TAO_StringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).bound (
- this,
-- original_type_def,
-+ bound,
- ACE_TRY_ENV
+@@ -20384,9 +19941,8 @@
);
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -20395,7 +19951,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -20407,7 +19963,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -20420,7 +19976,7 @@
+
+
+ CORBA::Any *
-IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -20436,16 +19992,16 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- IR::IDLType_ptr original_type_def,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- original_type_def_ (original_type_def)
--{}
--
--Dynamic::ParameterList *
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -20453,7 +20009,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_original_type_def = parameter_list->length ();
-- parameter_list->length (length_original_type_def + 1);
-- (*parameter_list)[length_original_type_def].argument <<= this->original_type_def_;
--
-- (*parameter_list)[length_original_type_def].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -20473,7 +20029,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -20486,7 +20042,7 @@
+
+
+ CORBA::Any *
-IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--#endif /* TAO_HAS_INTERCEPTORS */
--static const CORBA::Long _oc_IR_AliasDef[] =
-+static const CORBA::Long _oc_IR_StringDef[] =
++IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -20499,13 +20055,14 @@
+ }
+
+ #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
+ 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
-+ 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 = IR_StringDef
++ 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_StringDef (CORBA::tk_objref, sizeof (_oc_IR_StringDef), (char *) &_oc_IR_StringDef, 0, sizeof (IR_StringDef));
++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)
-+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StringDef, &_tc_TAO_tc_IR_StringDef)
- TAO_NAMESPACE_END
-
- ///////////////////////////////////////////////////////////////////////
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AliasDef, &_tc_TAO_tc_IR_AliasDef)
+@@ -20515,10 +20072,10 @@
// Base & Remote Proxy Implementation.
//
-IR::_TAO_NativeDef_Proxy_Impl::_TAO_NativeDef_Proxy_Impl (void)
-+_TAO_WstringDef_Proxy_Impl::_TAO_WstringDef_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_WstringDef_Remote_Proxy_Impl::_TAO_WstringDef_Remote_Proxy_Impl (void)
++_TAO_NativeDef_Remote_Proxy_Impl::_TAO_NativeDef_Remote_Proxy_Impl (void)
{}
// Remote Implementation of the IDL interface methods
+@@ -20533,37 +20090,37 @@
+ // Remote & Base Proxy Broker Implementation
+ //
--
--//
--// End Base & Remote Proxy Implemeentation.
--///////////////////////////////////////////////////////////////////////
--
--
--///////////////////////////////////////////////////////////////////////
--// Remote & Base Proxy Broker Implementation
--//
--
-IR::_TAO_NativeDef_Proxy_Broker::_TAO_NativeDef_Proxy_Broker (void)
-+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 = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
++_TAO_NativeDef_Proxy_Broker::_TAO_NativeDef_Proxy_Broker (void)
+ {
+ }
-IR::_TAO_NativeDef_Proxy_Broker::~_TAO_NativeDef_Proxy_Broker (void)
--{
--}
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_get_bound",
-+ 10,
-+ 0,
-+ istub->orb_core ()
-+ );
-
--// Factory Member function Implementation.
--IR::_TAO_NativeDef_Remote_Proxy_Broker *IR::_TAO_NativeDef_Remote_Proxy_Broker::the_TAO_NativeDef_Remote_Proxy_Broker (void)
--{
++_TAO_NativeDef_Proxy_Broker::~_TAO_NativeDef_Proxy_Broker (void)
+ {
+ }
+
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_NativeDef_Remote_Proxy_Broker *
+-IR::_TAO_NativeDef_Remote_Proxy_Broker::the_TAO_NativeDef_Remote_Proxy_Broker (void)
++_TAO_NativeDef_Remote_Proxy_Broker *
++_TAO_NativeDef_Remote_Proxy_Broker::the_TAO_NativeDef_Remote_Proxy_Broker (void)
+ {
- static ::IR::_TAO_NativeDef_Remote_Proxy_Broker remote_proxy_broker;
-- return &remote_proxy_broker;
--}
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
-+ );
-+ ACE_CHECK_RETURN (_tao_retval);
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ 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),
-+ _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
-+ );
-+ }
-+ break;
-+ }
-+
-+ return _tao_retval;
-+}
-+
-+void _TAO_WstringDef_Remote_Proxy_Impl::bound (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::ULong bound,
-+ 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_bound",
-+ 10,
-+ 1,
-+ istub->orb_core ()
-+ );
-+
-+ for (;;)
-+ {
-+ _tao_call.start (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 << bound)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
-+ {
-+ 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)
-+{
-+}
-+
-+_TAO_WstringDef_Proxy_Broker::~_TAO_WstringDef_Proxy_Broker (void)
-+{
-+}
++ 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)
-+// Factory function Implementation.
-+_TAO_WstringDef_Remote_Proxy_Broker *the_TAO_WstringDef_Remote_Proxy_Broker (void)
-+{
-+ static ::_TAO_WstringDef_Remote_Proxy_Broker remote_proxy_broker;
-+ return &remote_proxy_broker;
-+}
-+
-+_TAO_WstringDef_Remote_Proxy_Broker::_TAO_WstringDef_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_WstringDef_Remote_Proxy_Broker::~_TAO_WstringDef_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_WstringDef_Proxy_Impl&
-+_TAO_WstringDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_WstringDef *object,
++_TAO_NativeDef_Proxy_Impl&
++_TAO_NativeDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_NativeDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -20341,114 +12192,113 @@
+@@ -20579,109 +20136,109 @@
// default constructor
-IR::NativeDef::NativeDef (int collocated)
-+IR_WstringDef::IR_WstringDef (int collocated)
++IR_NativeDef::IR_NativeDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_NativeDef_setup_collocation (collocated);
}
// destructor
-IR::NativeDef::~NativeDef (void)
-+IR_WstringDef::~IR_WstringDef (void)
++IR_NativeDef::~IR_NativeDef (void)
{}
void
--IR::NativeDef::_tao_setup_collocation (int collocated)
-+IR_WstringDef::_tao_setup_collocation (int collocated)
+-IR::NativeDef::IR_NativeDef_setup_collocation (int collocated)
++IR_NativeDef::IR_NativeDef_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_NativeDef_Proxy_Broker_ =
+ this->the_TAO_NativeDef_Proxy_Broker_ =
- ::IR__TAO_NativeDef_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_WstringDef_Proxy_Broker_ =
-+ _TAO_WstringDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_NativeDef_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_NativeDef_Proxy_Broker_ =
+ this->the_TAO_NativeDef_Proxy_Broker_ =
- ::IR::_TAO_NativeDef_Remote_Proxy_Broker::the_TAO_NativeDef_Remote_Proxy_Broker ();
-+ this->the_TAO_WstringDef_Proxy_Broker_ =
-+ ::the_TAO_WstringDef_Remote_Proxy_Broker ();
-+
-+ IR_IDLType::_tao_setup_collocation (collocated);
++ _TAO_NativeDef_Remote_Proxy_Broker::the_TAO_NativeDef_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (IR, TypedefDef)::_tao_setup_collocation (collocated);
+ this->IR_TypedefDef_setup_collocation (collocated);
}
-void IR::NativeDef::_tao_any_destructor (void *x)
-+void IR_WstringDef::_tao_any_destructor (void *x)
++void IR_NativeDef::_tao_any_destructor (void *x)
{
- NativeDef *tmp = ACE_static_cast (NativeDef*,x);
-+ IR_WstringDef *tmp = ACE_static_cast (IR_WstringDef*,x);
++ IR_NativeDef *tmp = ACE_static_cast (IR_NativeDef*,x);
CORBA::release (tmp);
}
-IR::NativeDef_ptr IR::NativeDef::_narrow (
-+IR_WstringDef_ptr IR_WstringDef::_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_WstringDef::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/NativeDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (NativeDef::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/WstringDef:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_WstringDef::_nil ());
++ ACE_CHECK_RETURN (IR_NativeDef::_nil ());
if (is_a == 0)
- return NativeDef::_nil ();
-+ return IR_WstringDef::_nil ();
++ return IR_NativeDef::_nil ();
}
- return NativeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_WstringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_NativeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::NativeDef_ptr IR::NativeDef::_unchecked_narrow (
-+IR_WstringDef_ptr IR_WstringDef::_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_WstringDef::_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_WstringDef_ptr default_proxy = IR_WstringDef::_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_WstringDef_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_WstringDef (
++ ::IR_NativeDef (
stub,
1,
obj->_servant ()),
- NativeDef::_nil ());
-+ IR_WstringDef::_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_WstringDef (stub, 0, obj->_servant ()), IR_WstringDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_NativeDef (stub, 0, obj->_servant ()), IR_NativeDef::_nil ());
return default_proxy;
}
else
@@ -25286,14 +12226,14 @@
ACE_reinterpret_cast
(
- NativeDef_ptr,
-+ IR_WstringDef_ptr,
++ IR_NativeDef_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &NativeDef::_narrow
-+ &IR_WstringDef::_narrow
++ &IR_NativeDef::_narrow
)
)
);
@@ -25301,8 +12241,8 @@
-IR::NativeDef_ptr
-IR::NativeDef::_duplicate (NativeDef_ptr obj)
-+IR_WstringDef_ptr
-+IR_WstringDef::_duplicate (IR_WstringDef_ptr obj)
++IR_NativeDef_ptr
++IR_NativeDef::_duplicate (IR_NativeDef_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -25310,55 +12250,53 @@
}
-CORBA::Boolean IR::NativeDef::_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)
++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")) ||
-- (!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/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")))
-@@ -20457,58 +12307,34 @@
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/NativeDef:1.0")) ||
+@@ -20695,58 +20252,58 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::NativeDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_WstringDef::_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_WstringDef::_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))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_TypedefDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_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
@@ -25385,643 +12323,233 @@
this
)
);
-@@ -20521,39 +12347,66 @@
+@@ -20759,21 +20316,18 @@
return retv;
}
-const char* IR::NativeDef::_interface_repository_id (void) const
-+const char* IR_WstringDef::_interface_repository_id (void) const
++const char* IR_NativeDef::_interface_repository_id (void) const
{
-- return "IDL:omg.org/IR/NativeDef:1.0";
-+ return "IDL:omg.org/IR/WstringDef:1.0";
+ return "IDL:omg.org/IR/NativeDef:1.0";
}
-+CORBA::ULong IR_WstringDef::bound (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ return this->the_TAO_WstringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).bound (
-+ this,
-+ ACE_TRY_ENV
-+ );
-+}
-
+-
-#if (TAO_HAS_INTERCEPTORS == 1)
-#endif /* TAO_HAS_INTERCEPTORS */
--static const CORBA::Long _oc_IR_NativeDef[] =
-+void IR_WstringDef::bound (
-+ CORBA::ULong bound,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ this->the_TAO_WstringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).bound (
-+ this,
-+ bound,
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+static const CORBA::Long _oc_IR_WstringDef[] =
+ 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
+ 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
-+ 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 = IR_WstringDef
++ 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_WstringDef (CORBA::tk_objref, sizeof (_oc_IR_WstringDef), (char *) &_oc_IR_WstringDef, 0, sizeof (IR_WstringDef));
++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)
-+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_WstringDef, &_tc_TAO_tc_IR_WstringDef)
- TAO_NAMESPACE_END
-
- ///////////////////////////////////////////////////////////////////////
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_NativeDef, &_tc_TAO_tc_IR_NativeDef)
+@@ -20783,15 +20337,15 @@
// Base & Remote Proxy Implementation.
//
-IR::_TAO_PrimitiveDef_Proxy_Impl::_TAO_PrimitiveDef_Proxy_Impl (void)
-+_TAO_FixedDef_Proxy_Impl::_TAO_FixedDef_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_FixedDef_Remote_Proxy_Impl::_TAO_FixedDef_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 (
-+CORBA::UShort _TAO_FixedDef_Remote_Proxy_Impl::digits (
++IR_PrimitiveKind _TAO_PrimitiveDef_Remote_Proxy_Impl::kind (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -20562,7 +12415,7 @@
+@@ -20799,15 +20353,12 @@
+ CORBA::SystemException
))
{
-
+-
- IR::PrimitiveKind _tao_retval = (IR::PrimitiveKind)0;
-+ CORBA::UShort _tao_retval = 0;
-
+-
++ IR_PrimitiveKind _tao_retval = (IR_PrimitiveKind)0;
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -20572,183 +12425,287 @@
-
- TAO_GIOP_Twoway_Invocation _tao_call (
- istub,
-- "_get_kind",
-- 9,
-+ "_get_digits",
-+ 11,
- 0,
- istub->orb_core ()
- );
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_kind",
+@@ -20828,7 +20379,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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)
-- ))
-- {
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-- _tao_retval
-- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -20884,7 +20435,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::PrimitiveKind _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ ACE_CHECK_RETURN (_tao_retval);
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ _tao_retval
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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
-+ );
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
- return _tao_retval;
- }
++ IR_PrimitiveKind _tao_retval_info = _tao_retval;
+ ri.result (_tao_retval_info);
+ );
+
+@@ -20959,37 +20510,37 @@
+ // Remote & Base Proxy Broker Implementation
+ //
--
--//
--// End Base & Remote Proxy Implemeentation.
--///////////////////////////////////////////////////////////////////////
--
--
--///////////////////////////////////////////////////////////////////////
--// Remote & Base Proxy Broker Implementation
--//
--
-IR::_TAO_PrimitiveDef_Proxy_Broker::_TAO_PrimitiveDef_Proxy_Broker (void)
-+void _TAO_FixedDef_Remote_Proxy_Impl::digits (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::UShort digits,
-+ 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_PrimitiveDef_Proxy_Broker::_TAO_PrimitiveDef_Proxy_Broker (void)
+ {
+ }
-IR::_TAO_PrimitiveDef_Proxy_Broker::~_TAO_PrimitiveDef_Proxy_Broker (void)
--{
--}
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_set_digits",
-+ 11,
-+ 1,
-+ istub->orb_core ()
-+ );
-
--// Factory Member function Implementation.
--IR::_TAO_PrimitiveDef_Remote_Proxy_Broker *IR::_TAO_PrimitiveDef_Remote_Proxy_Broker::the_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
--{
++_TAO_PrimitiveDef_Proxy_Broker::~_TAO_PrimitiveDef_Proxy_Broker (void)
+ {
+ }
+
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_PrimitiveDef_Remote_Proxy_Broker *
+-IR::_TAO_PrimitiveDef_Remote_Proxy_Broker::the_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
++_TAO_PrimitiveDef_Remote_Proxy_Broker *
++_TAO_PrimitiveDef_Remote_Proxy_Broker::the_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
+ {
- static ::IR::_TAO_PrimitiveDef_Remote_Proxy_Broker remote_proxy_broker;
-- return &remote_proxy_broker;
-+ for (;;)
-+ {
-+ _tao_call.start (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 << digits)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
-+ {
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
-+ }
-+
-+ break;
-+ }
++ 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)
-+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 = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
++_TAO_PrimitiveDef_Remote_Proxy_Broker::_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
+ {
+ }
-IR::_TAO_PrimitiveDef_Remote_Proxy_Broker::~_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
--{
--}
-+
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_get_scale",
-+ 10,
-+ 0,
-+ istub->orb_core ()
-+ );
++_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,
-- CORBA::Environment &ACE_TRY_ENV
--)
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
-+ );
-+ ACE_CHECK_RETURN (_tao_retval);
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ 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),
-+ _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
-+ );
-+ }
-+ break;
-+ }
-+
-+ return _tao_retval;
-+}
-+
-+void _TAO_FixedDef_Remote_Proxy_Impl::scale (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Short scale,
-+ 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_scale",
-+ 10,
-+ 1,
-+ istub->orb_core ()
-+ );
-+
-+ for (;;)
-+ {
-+ _tao_call.start (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 << scale)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
-+ {
-+ 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)
-+{
-+}
-+
-+_TAO_FixedDef_Proxy_Broker::~_TAO_FixedDef_Proxy_Broker (void)
-+{
-+}
-+
-+// Factory function Implementation.
-+_TAO_FixedDef_Remote_Proxy_Broker *the_TAO_FixedDef_Remote_Proxy_Broker (void)
-+{
-+ static ::_TAO_FixedDef_Remote_Proxy_Broker remote_proxy_broker;
-+ return &remote_proxy_broker;
-+}
-+
-+_TAO_FixedDef_Remote_Proxy_Broker::_TAO_FixedDef_Remote_Proxy_Broker (void)
-+{
-+}
-+
-+_TAO_FixedDef_Remote_Proxy_Broker::~_TAO_FixedDef_Remote_Proxy_Broker (void)
-+{
-+}
-+
-+_TAO_FixedDef_Proxy_Impl&
-+_TAO_FixedDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_FixedDef *object,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
++_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);
-@@ -20762,112 +12719,113 @@
+@@ -21005,109 +20556,109 @@
// default constructor
-IR::PrimitiveDef::PrimitiveDef (int collocated)
-+IR_FixedDef::IR_FixedDef (int collocated)
++IR_PrimitiveDef::IR_PrimitiveDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_PrimitiveDef_setup_collocation (collocated);
}
// destructor
-IR::PrimitiveDef::~PrimitiveDef (void)
-+IR_FixedDef::~IR_FixedDef (void)
++IR_PrimitiveDef::~IR_PrimitiveDef (void)
{}
void
--IR::PrimitiveDef::_tao_setup_collocation (int collocated)
-+IR_FixedDef::_tao_setup_collocation (int collocated)
+-IR::PrimitiveDef::IR_PrimitiveDef_setup_collocation (int collocated)
++IR_PrimitiveDef::IR_PrimitiveDef_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_PrimitiveDef_Proxy_Broker_ =
+ this->the_TAO_PrimitiveDef_Proxy_Broker_ =
- ::IR__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_FixedDef_Proxy_Broker_ =
-+ _TAO_FixedDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_PrimitiveDef_Proxy_Broker_ =
+ this->the_TAO_PrimitiveDef_Proxy_Broker_ =
- ::IR::_TAO_PrimitiveDef_Remote_Proxy_Broker::the_TAO_PrimitiveDef_Remote_Proxy_Broker ();
-+ this->the_TAO_FixedDef_Proxy_Broker_ =
-+ ::the_TAO_FixedDef_Remote_Proxy_Broker ();
-+
-+ IR_IDLType::_tao_setup_collocation (collocated);
++ _TAO_PrimitiveDef_Remote_Proxy_Broker::the_TAO_PrimitiveDef_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (IR, IDLType)::_tao_setup_collocation (collocated);
+ this->IR_IDLType_setup_collocation (collocated);
}
-void IR::PrimitiveDef::_tao_any_destructor (void *x)
-+void IR_FixedDef::_tao_any_destructor (void *x)
++void IR_PrimitiveDef::_tao_any_destructor (void *x)
{
- PrimitiveDef *tmp = ACE_static_cast (PrimitiveDef*,x);
-+ IR_FixedDef *tmp = ACE_static_cast (IR_FixedDef*,x);
++ IR_PrimitiveDef *tmp = ACE_static_cast (IR_PrimitiveDef*,x);
CORBA::release (tmp);
}
-IR::PrimitiveDef_ptr IR::PrimitiveDef::_narrow (
-+IR_FixedDef_ptr IR_FixedDef::_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_FixedDef::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PrimitiveDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (PrimitiveDef::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FixedDef:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_FixedDef::_nil ());
++ ACE_CHECK_RETURN (IR_PrimitiveDef::_nil ());
if (is_a == 0)
- return PrimitiveDef::_nil ();
-+ return IR_FixedDef::_nil ();
++ return IR_PrimitiveDef::_nil ();
}
- return PrimitiveDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_FixedDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_PrimitiveDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::PrimitiveDef_ptr IR::PrimitiveDef::_unchecked_narrow (
-+IR_FixedDef_ptr IR_FixedDef::_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_FixedDef::_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_FixedDef_ptr default_proxy = IR_FixedDef::_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_FixedDef_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_FixedDef (
++ ::IR_PrimitiveDef (
stub,
1,
obj->_servant ()),
- PrimitiveDef::_nil ());
-+ IR_FixedDef::_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_FixedDef (stub, 0, obj->_servant ()), IR_FixedDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_PrimitiveDef (stub, 0, obj->_servant ()), IR_PrimitiveDef::_nil ());
return default_proxy;
}
else
@@ -26029,14 +12557,14 @@
ACE_reinterpret_cast
(
- PrimitiveDef_ptr,
-+ IR_FixedDef_ptr,
++ IR_PrimitiveDef_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &PrimitiveDef::_narrow
-+ &IR_FixedDef::_narrow
++ &IR_PrimitiveDef::_narrow
)
)
);
@@ -26044,8 +12572,8 @@
-IR::PrimitiveDef_ptr
-IR::PrimitiveDef::_duplicate (PrimitiveDef_ptr obj)
-+IR_FixedDef_ptr
-+IR_FixedDef::_duplicate (IR_FixedDef_ptr obj)
++IR_PrimitiveDef_ptr
++IR_PrimitiveDef::_duplicate (IR_PrimitiveDef_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -26053,26 +12581,22 @@
}
-CORBA::Boolean IR::PrimitiveDef::_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)
++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/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")))
-@@ -20876,34 +12834,34 @@
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PrimitiveDef:1.0")) ||
+@@ -21119,34 +20670,34 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::PrimitiveDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_FixedDef::_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_FixedDef::_narrow))
++ &IR_PrimitiveDef::_narrow))
retv = ACE_reinterpret_cast (void*, this);
else if (type == ACE_reinterpret_cast
(ptr_arith_t,
@@ -26102,340 +12626,138 @@
this
)
);
-@@ -20916,12 +12874,12 @@
+@@ -21159,12 +20710,12 @@
return retv;
}
-const char* IR::PrimitiveDef::_interface_repository_id (void) const
-+const char* IR_FixedDef::_interface_repository_id (void) const
++const char* IR_PrimitiveDef::_interface_repository_id (void) const
{
-- return "IDL:omg.org/IR/PrimitiveDef:1.0";
-+ return "IDL:omg.org/IR/FixedDef:1.0";
+ return "IDL:omg.org/IR/PrimitiveDef:1.0";
}
-IR::PrimitiveKind IR::PrimitiveDef::kind (
-+CORBA::UShort IR_FixedDef::digits (
++IR_PrimitiveKind IR_PrimitiveDef::kind (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -20929,96 +12887,83 @@
- ))
- {
-
-- return this->the_TAO_PrimitiveDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).kind (
-+ return this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).digits (
- this,
- ACE_TRY_ENV
+@@ -21181,9 +20732,8 @@
);
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-+void IR_FixedDef::digits (
-+ CORBA::UShort digits,
-+ CORBA::Environment &ACE_TRY_ENV
- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -21192,7 +20742,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return parameter_list;
-+ this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).digits (
-+ this,
-+ digits,
-+ ACE_TRY_ENV
-+ );
++IR_PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -21204,7 +20754,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+CORBA::Short IR_FixedDef::scale (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return exception_list;
-+ return this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).scale (
-+ this,
-+ ACE_TRY_ENV
-+ );
- }
++IR_PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -21217,7 +20767,7 @@
--
--CORBA::Any *
+
+ CORBA::Any *
-IR::PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void IR_FixedDef::scale (
-+ CORBA::Short scale,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
-
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -21233,20 +20783,21 @@
+ }
+
+ void
-IR::PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::result (IR::PrimitiveKind result)
--{
-- // update the result
-- this->_result = result;
-+ this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).scale (
-+ this,
-+ scale,
-+ ACE_TRY_ENV
-+ );
++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[] =
-+static const CORBA::Long _oc_IR_FixedDef[] =
+ #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
+ 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
-+ 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 = IR_FixedDef
++ 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_FixedDef (CORBA::tk_objref, sizeof (_oc_IR_FixedDef), (char *) &_oc_IR_FixedDef, 0, sizeof (IR_FixedDef));
++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)
-+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FixedDef, &_tc_TAO_tc_IR_FixedDef)
- TAO_NAMESPACE_END
-
- ///////////////////////////////////////////////////////////////////////
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrimitiveDef, &_tc_TAO_tc_IR_PrimitiveDef)
+@@ -21256,15 +20807,15 @@
// Base & Remote Proxy Implementation.
//
-IR::_TAO_StringDef_Proxy_Impl::_TAO_StringDef_Proxy_Impl (void)
-+_TAO_SequenceDef_Proxy_Impl::_TAO_SequenceDef_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_SequenceDef_Remote_Proxy_Impl::_TAO_SequenceDef_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_SequenceDef_Remote_Proxy_Impl::bound (
++CORBA::ULong _TAO_StringDef_Remote_Proxy_Impl::bound (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -21043,140 +12988,51 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
+@@ -21272,15 +20823,12 @@
+ CORBA::SystemException
+ ))
+ {
-
--#endif /* TAO_HAS_INTERCEPTORS */
+ CORBA::ULong _tao_retval = 0;
+
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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)
-- ))
-- {
-- TAO_INTERCEPTOR_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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ ACE_CHECK_RETURN (_tao_retval);
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ _tao_retval
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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
-+ );
-+ }
-+ break;
-+ }
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_bound",
+@@ -21301,7 +20849,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
+- IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get ri (
++ IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -21422,7 +20970,7 @@
return _tao_retval;
}
-void IR::_TAO_StringDef_Remote_Proxy_Impl::bound (
-+void _TAO_SequenceDef_Remote_Proxy_Impl::bound (
++void _TAO_StringDef_Remote_Proxy_Impl::bound (
CORBA_Object *_collocated_tao_target_,
CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
-@@ -21185,15 +13041,10 @@
+@@ -21431,15 +20979,10 @@
CORBA::SystemException
))
{
@@ -26451,545 +12773,163 @@
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_bound",
-@@ -21202,168 +13053,285 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- bound,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << bound)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-+ ACE_CHECK;
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << bound)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
+@@ -21460,7 +21003,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
- }
--
-- break;
-- }
--
--}
--
--
--//
--// End Base & Remote Proxy Implemeentation.
--///////////////////////////////////////////////////////////////////////
--
--
--///////////////////////////////////////////////////////////////////////
--// Remote & Base Proxy Broker Implementation
--//
--
+ #if TAO_HAS_INTERCEPTORS == 1
+- IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set ri (
++ IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ bound,
+@@ -21584,37 +21127,37 @@
+ // 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)
--{
-+
-+ break;
-+ }
++_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)
-+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
-+ ))
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_StringDef_Remote_Proxy_Broker *
+-IR::_TAO_StringDef_Remote_Proxy_Broker::the_TAO_StringDef_Remote_Proxy_Broker (void)
++_TAO_StringDef_Remote_Proxy_Broker *
++_TAO_StringDef_Remote_Proxy_Broker::the_TAO_StringDef_Remote_Proxy_Broker (void)
{
- static ::IR::_TAO_StringDef_Remote_Proxy_Broker remote_proxy_broker;
-- return &remote_proxy_broker;
--}
-+
-+ 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);
++ 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_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_get_element_type",
-+ 17,
-+ 0,
-+ istub->orb_core ()
-+ );
++_TAO_StringDef_Remote_Proxy_Broker::_TAO_StringDef_Remote_Proxy_Broker (void)
+ {
+ }
-IR::_TAO_StringDef_Remote_Proxy_Broker::~_TAO_StringDef_Remote_Proxy_Broker (void)
--{
-+ 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;
-+ }
-+
-+ return _tao_safe_retval._retn ();
-+}
-+
-+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 = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-+
-+
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_get_element_type_def",
-+ 21,
-+ 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;
-+ }
-+
-+ return _tao_safe_retval._retn ();
-+}
-+
-+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
-+ )
-+ 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",
-+ 21,
-+ 1,
-+ istub->orb_core ()
-+ );
-+
-+ for (;;)
-+ {
-+ _tao_call.start (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 << element_type_def)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
-+ {
-+ 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)
-+{
-+}
-+
-+_TAO_SequenceDef_Proxy_Broker::~_TAO_SequenceDef_Proxy_Broker (void)
-+{
-+}
-+
-+// Factory function Implementation.
-+_TAO_SequenceDef_Remote_Proxy_Broker *the_TAO_SequenceDef_Remote_Proxy_Broker (void)
-+{
-+ static ::_TAO_SequenceDef_Remote_Proxy_Broker remote_proxy_broker;
-+ return &remote_proxy_broker;
-+}
-+
-+_TAO_SequenceDef_Remote_Proxy_Broker::_TAO_SequenceDef_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_SequenceDef_Remote_Proxy_Broker::~_TAO_SequenceDef_Remote_Proxy_Broker (void)
-+{
-+}
-+
-+_TAO_SequenceDef_Proxy_Impl&
-+_TAO_SequenceDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_SequenceDef *object,
++_TAO_StringDef_Proxy_Impl&
++_TAO_StringDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_StringDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -21379,112 +13347,113 @@
+@@ -21630,109 +21173,109 @@
// default constructor
-IR::StringDef::StringDef (int collocated)
-+IR_SequenceDef::IR_SequenceDef (int collocated)
++IR_StringDef::IR_StringDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_StringDef_setup_collocation (collocated);
}
// destructor
-IR::StringDef::~StringDef (void)
-+IR_SequenceDef::~IR_SequenceDef (void)
++IR_StringDef::~IR_StringDef (void)
{}
void
--IR::StringDef::_tao_setup_collocation (int collocated)
-+IR_SequenceDef::_tao_setup_collocation (int collocated)
+-IR::StringDef::IR_StringDef_setup_collocation (int collocated)
++IR_StringDef::IR_StringDef_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_StringDef_Proxy_Broker_ =
+ this->the_TAO_StringDef_Proxy_Broker_ =
- ::IR__TAO_StringDef_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_SequenceDef_Proxy_Broker_ =
-+ _TAO_SequenceDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_StringDef_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_StringDef_Proxy_Broker_ =
+ this->the_TAO_StringDef_Proxy_Broker_ =
- ::IR::_TAO_StringDef_Remote_Proxy_Broker::the_TAO_StringDef_Remote_Proxy_Broker ();
-+ this->the_TAO_SequenceDef_Proxy_Broker_ =
-+ ::the_TAO_SequenceDef_Remote_Proxy_Broker ();
-+
-+ IR_IDLType::_tao_setup_collocation (collocated);
++ _TAO_StringDef_Remote_Proxy_Broker::the_TAO_StringDef_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (IR, IDLType)::_tao_setup_collocation (collocated);
+ this->IR_IDLType_setup_collocation (collocated);
}
-void IR::StringDef::_tao_any_destructor (void *x)
-+void IR_SequenceDef::_tao_any_destructor (void *x)
++void IR_StringDef::_tao_any_destructor (void *x)
{
- StringDef *tmp = ACE_static_cast (StringDef*,x);
-+ IR_SequenceDef *tmp = ACE_static_cast (IR_SequenceDef*,x);
++ IR_StringDef *tmp = ACE_static_cast (IR_StringDef*,x);
CORBA::release (tmp);
}
-IR::StringDef_ptr IR::StringDef::_narrow (
-+IR_SequenceDef_ptr IR_SequenceDef::_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_SequenceDef::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/StringDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (StringDef::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/SequenceDef:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_SequenceDef::_nil ());
++ ACE_CHECK_RETURN (IR_StringDef::_nil ());
if (is_a == 0)
- return StringDef::_nil ();
-+ return IR_SequenceDef::_nil ();
++ return IR_StringDef::_nil ();
}
- return StringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_SequenceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_StringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::StringDef_ptr IR::StringDef::_unchecked_narrow (
-+IR_SequenceDef_ptr IR_SequenceDef::_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_SequenceDef::_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_SequenceDef_ptr default_proxy = IR_SequenceDef::_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_SequenceDef_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_SequenceDef (
++ ::IR_StringDef (
stub,
1,
obj->_servant ()),
- StringDef::_nil ());
-+ IR_SequenceDef::_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_SequenceDef (stub, 0, obj->_servant ()), IR_SequenceDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_StringDef (stub, 0, obj->_servant ()), IR_StringDef::_nil ());
return default_proxy;
}
else
@@ -26997,14 +12937,14 @@
ACE_reinterpret_cast
(
- StringDef_ptr,
-+ IR_SequenceDef_ptr,
++ IR_StringDef_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &StringDef::_narrow
-+ &IR_SequenceDef::_narrow
++ &IR_StringDef::_narrow
)
)
);
@@ -27012,8 +12952,8 @@
-IR::StringDef_ptr
-IR::StringDef::_duplicate (StringDef_ptr obj)
-+IR_SequenceDef_ptr
-+IR_SequenceDef::_duplicate (IR_SequenceDef_ptr obj)
++IR_StringDef_ptr
++IR_StringDef::_duplicate (IR_StringDef_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -27021,26 +12961,22 @@
}
-CORBA::Boolean IR::StringDef::_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)
++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/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")))
-@@ -21493,34 +13462,34 @@
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/StringDef:1.0")) ||
+@@ -21744,34 +21287,34 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::StringDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_SequenceDef::_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_SequenceDef::_narrow))
++ &IR_StringDef::_narrow))
retv = ACE_reinterpret_cast (void*, this);
else if (type == ACE_reinterpret_cast
(ptr_arith_t,
@@ -27070,419 +13006,182 @@
this
)
);
-@@ -21533,12 +13502,12 @@
+@@ -21784,12 +21327,12 @@
return retv;
}
-const char* IR::StringDef::_interface_repository_id (void) const
-+const char* IR_SequenceDef::_interface_repository_id (void) const
++const char* IR_StringDef::_interface_repository_id (void) const
{
-- return "IDL:omg.org/IR/StringDef:1.0";
-+ return "IDL:omg.org/IR/SequenceDef:1.0";
+ return "IDL:omg.org/IR/StringDef:1.0";
}
-CORBA::ULong IR::StringDef::bound (
-+CORBA::ULong IR_SequenceDef::bound (
++CORBA::ULong IR_StringDef::bound (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -21546,13 +13515,13 @@
- ))
- {
-
-- return this->the_TAO_StringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).bound (
-+ return this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).bound (
- this,
- ACE_TRY_ENV
+@@ -21806,7 +21349,7 @@
);
}
-void IR::StringDef::bound (
-+void IR_SequenceDef::bound (
++void IR_StringDef::bound (
CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -21561,152 +13530,82 @@
- ))
- {
-
-- this->the_TAO_StringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).bound (
-+ this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).bound (
- this,
- bound,
- ACE_TRY_ENV
+@@ -21825,9 +21368,8 @@
);
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::TAO_ClientRequestInfo_IR_StringDef_bound_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-+CORBA::TypeCode_ptr IR_SequenceDef::element_type (
-+ CORBA::Environment &ACE_TRY_ENV
- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::TAO_ClientRequestInfo_IR_StringDef_bound_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -21836,7 +21378,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -21848,7 +21390,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -21861,7 +21403,7 @@
+
+
+ CORBA::Any *
-IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -21877,13 +21419,13 @@
+ }
+
+ void
-IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::result (CORBA::ULong result)
--{
-- // update the result
-- this->_result = result;
-+ return this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).element_type (
-+ this,
-+ ACE_TRY_ENV
-+ );
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const CORBA::ULong & bound,
-- CORBA::Environment &
-+IR_IDLType_ptr IR_SequenceDef::element_type_def (
-+ CORBA::Environment &ACE_TRY_ENV
- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- bound_ (bound)
--{}
--
--Dynamic::ParameterList *
++IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::TAO_ClientRequestInfo_IR_StringDef_bound_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const CORBA::ULong & bound,
+@@ -21894,7 +21436,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_bound = parameter_list->length ();
-- parameter_list->length (length_bound + 1);
-- (*parameter_list)[length_bound].argument <<= bound_;
-- (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return exception_list;
-+ return this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).element_type_def (
-+ this,
-+ ACE_TRY_ENV
-+ );
++IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -21913,7 +21455,7 @@
}
--
--CORBA::Any *
+ Dynamic::ExceptionList *
+-IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
++IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -21926,7 +21468,7 @@
+
+
+ CORBA::Any *
-IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void IR_SequenceDef::element_type_def (
-+ IR_IDLType_ptr element_type_def,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return result_any;
-+ this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).element_type_def (
-+ this,
-+ element_type_def,
-+ ACE_TRY_ENV
-+ );
++IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -21939,13 +21481,14 @@
}
--#endif /* TAO_HAS_INTERCEPTORS */
--static const CORBA::Long _oc_IR_StringDef[] =
-+static const CORBA::Long _oc_IR_SequenceDef[] =
+ #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
+ 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
-+ 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 = IR_SequenceDef
++ 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_SequenceDef (CORBA::tk_objref, sizeof (_oc_IR_SequenceDef), (char *) &_oc_IR_SequenceDef, 0, sizeof (IR_SequenceDef));
++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)
-+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SequenceDef, &_tc_TAO_tc_IR_SequenceDef)
- TAO_NAMESPACE_END
-
- ///////////////////////////////////////////////////////////////////////
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StringDef, &_tc_TAO_tc_IR_StringDef)
+@@ -21955,15 +21498,15 @@
// Base & Remote Proxy Implementation.
//
-IR::_TAO_WstringDef_Proxy_Impl::_TAO_WstringDef_Proxy_Impl (void)
-+_TAO_ArrayDef_Proxy_Impl::_TAO_ArrayDef_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_ArrayDef_Remote_Proxy_Impl::_TAO_ArrayDef_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_ArrayDef_Remote_Proxy_Impl::length (
++CORBA::ULong _TAO_WstringDef_Remote_Proxy_Impl::bound (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -21725,295 +13624,318 @@
+@@ -21971,15 +21514,12 @@
+ CORBA::SystemException
+ ))
+ {
+-
+ CORBA::ULong _tao_retval = 0;
- TAO_GIOP_Twoway_Invocation _tao_call (
- istub,
-- "_get_bound",
-- 10,
-+ "_get_length",
-+ 11,
- 0,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-
--#endif /* TAO_HAS_INTERCEPTORS */
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_bound",
+@@ -22000,7 +21540,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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)
-- ))
-- {
-- TAO_INTERCEPTOR_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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ ACE_CHECK_RETURN (_tao_retval);
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ _tao_retval
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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
-+ );
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -22121,7 +21661,7 @@
return _tao_retval;
}
-void IR::_TAO_WstringDef_Remote_Proxy_Impl::bound (
-+void _TAO_ArrayDef_Remote_Proxy_Impl::length (
++void _TAO_WstringDef_Remote_Proxy_Impl::bound (
CORBA_Object *_collocated_tao_target_,
-- CORBA::ULong bound,
-+ CORBA::ULong length,
+ CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
+@@ -22130,15 +21670,10 @@
CORBA::SystemException
))
{
@@ -27497,519 +13196,164 @@
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
-- "_set_bound",
-- 10,
-+ "_set_length",
-+ 11,
- 1,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- bound,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << bound)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ ACE_CHECK;
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << length)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
-+ }
-+
-+ break;
-+ }
-+}
-+
-+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 = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-+
-+
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_get_element_type",
-+ 17,
-+ 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_TRY_CHECK;
-- ACE_RE_THROW;
-+ 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
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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;
-+ }
-+
-+ return _tao_safe_retval._retn ();
-+}
-+
-+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 = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-+
-+
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_get_element_type_def",
-+ 21,
-+ 0,
-+ istub->orb_core ()
-+ );
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ 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)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ 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;
-+ }
-+
-+ return _tao_safe_retval._retn ();
-+}
-+
-+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
-+ )
-+ 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",
-+ 21,
-+ 1,
-+ istub->orb_core ()
-+ );
-+
-+ for (;;)
-+ {
-+ _tao_call.start (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 << element_type_def)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
+ "_set_bound",
+@@ -22159,7 +21694,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
-- break;
-- }
--
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
-+ {
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
-+ }
-+
-+ break;
-+ }
- }
-
-
-@@ -22026,32 +13948,32 @@
+ #if TAO_HAS_INTERCEPTORS == 1
+- IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set ri (
++ IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ bound,
+@@ -22283,37 +21818,37 @@
// Remote & Base Proxy Broker Implementation
//
-IR::_TAO_WstringDef_Proxy_Broker::_TAO_WstringDef_Proxy_Broker (void)
-+_TAO_ArrayDef_Proxy_Broker::_TAO_ArrayDef_Proxy_Broker (void)
++_TAO_WstringDef_Proxy_Broker::_TAO_WstringDef_Proxy_Broker (void)
{
}
-IR::_TAO_WstringDef_Proxy_Broker::~_TAO_WstringDef_Proxy_Broker (void)
-+_TAO_ArrayDef_Proxy_Broker::~_TAO_ArrayDef_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_ArrayDef_Remote_Proxy_Broker *the_TAO_ArrayDef_Remote_Proxy_Broker (void)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_WstringDef_Remote_Proxy_Broker *
+-IR::_TAO_WstringDef_Remote_Proxy_Broker::the_TAO_WstringDef_Remote_Proxy_Broker (void)
++_TAO_WstringDef_Remote_Proxy_Broker *
++_TAO_WstringDef_Remote_Proxy_Broker::the_TAO_WstringDef_Remote_Proxy_Broker (void)
{
- static ::IR::_TAO_WstringDef_Remote_Proxy_Broker remote_proxy_broker;
-+ static ::_TAO_ArrayDef_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_ArrayDef_Remote_Proxy_Broker::_TAO_ArrayDef_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_ArrayDef_Remote_Proxy_Broker::~_TAO_ArrayDef_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_ArrayDef_Proxy_Impl&
-+_TAO_ArrayDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_ArrayDef *object,
++_TAO_WstringDef_Proxy_Impl&
++_TAO_WstringDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_WstringDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -22067,112 +13989,113 @@
+@@ -22329,109 +21864,109 @@
// default constructor
-IR::WstringDef::WstringDef (int collocated)
-+IR_ArrayDef::IR_ArrayDef (int collocated)
++IR_WstringDef::IR_WstringDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_WstringDef_setup_collocation (collocated);
}
// destructor
-IR::WstringDef::~WstringDef (void)
-+IR_ArrayDef::~IR_ArrayDef (void)
++IR_WstringDef::~IR_WstringDef (void)
{}
void
--IR::WstringDef::_tao_setup_collocation (int collocated)
-+IR_ArrayDef::_tao_setup_collocation (int collocated)
+-IR::WstringDef::IR_WstringDef_setup_collocation (int collocated)
++IR_WstringDef::IR_WstringDef_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_WstringDef_Proxy_Broker_ =
+ this->the_TAO_WstringDef_Proxy_Broker_ =
- ::IR__TAO_WstringDef_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_ArrayDef_Proxy_Broker_ =
-+ _TAO_ArrayDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_WstringDef_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_WstringDef_Proxy_Broker_ =
+ this->the_TAO_WstringDef_Proxy_Broker_ =
- ::IR::_TAO_WstringDef_Remote_Proxy_Broker::the_TAO_WstringDef_Remote_Proxy_Broker ();
-+ this->the_TAO_ArrayDef_Proxy_Broker_ =
-+ ::the_TAO_ArrayDef_Remote_Proxy_Broker ();
-+
-+ IR_IDLType::_tao_setup_collocation (collocated);
++ _TAO_WstringDef_Remote_Proxy_Broker::the_TAO_WstringDef_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (IR, IDLType)::_tao_setup_collocation (collocated);
+ this->IR_IDLType_setup_collocation (collocated);
}
-void IR::WstringDef::_tao_any_destructor (void *x)
-+void IR_ArrayDef::_tao_any_destructor (void *x)
++void IR_WstringDef::_tao_any_destructor (void *x)
{
- WstringDef *tmp = ACE_static_cast (WstringDef*,x);
-+ IR_ArrayDef *tmp = ACE_static_cast (IR_ArrayDef*,x);
++ IR_WstringDef *tmp = ACE_static_cast (IR_WstringDef*,x);
CORBA::release (tmp);
}
-IR::WstringDef_ptr IR::WstringDef::_narrow (
-+IR_ArrayDef_ptr IR_ArrayDef::_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_ArrayDef::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/WstringDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (WstringDef::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ArrayDef:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_ArrayDef::_nil ());
++ ACE_CHECK_RETURN (IR_WstringDef::_nil ());
if (is_a == 0)
- return WstringDef::_nil ();
-+ return IR_ArrayDef::_nil ();
++ return IR_WstringDef::_nil ();
}
- return WstringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_ArrayDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_WstringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::WstringDef_ptr IR::WstringDef::_unchecked_narrow (
-+IR_ArrayDef_ptr IR_ArrayDef::_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_ArrayDef::_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_ArrayDef_ptr default_proxy = IR_ArrayDef::_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_ArrayDef_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_ArrayDef (
++ ::IR_WstringDef (
stub,
1,
obj->_servant ()),
- WstringDef::_nil ());
-+ IR_ArrayDef::_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_ArrayDef (stub, 0, obj->_servant ()), IR_ArrayDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_WstringDef (stub, 0, obj->_servant ()), IR_WstringDef::_nil ());
return default_proxy;
}
else
@@ -28017,14 +13361,14 @@
ACE_reinterpret_cast
(
- WstringDef_ptr,
-+ IR_ArrayDef_ptr,
++ IR_WstringDef_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &WstringDef::_narrow
-+ &IR_ArrayDef::_narrow
++ &IR_WstringDef::_narrow
)
)
);
@@ -28032,8 +13376,8 @@
-IR::WstringDef_ptr
-IR::WstringDef::_duplicate (WstringDef_ptr obj)
-+IR_ArrayDef_ptr
-+IR_ArrayDef::_duplicate (IR_ArrayDef_ptr obj)
++IR_WstringDef_ptr
++IR_WstringDef::_duplicate (IR_WstringDef_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -28041,26 +13385,22 @@
}
-CORBA::Boolean IR::WstringDef::_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)
++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/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")))
-@@ -22181,34 +14104,34 @@
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/WstringDef:1.0")) ||
+@@ -22443,34 +21978,34 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::WstringDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_ArrayDef::_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_ArrayDef::_narrow))
++ &IR_WstringDef::_narrow))
retv = ACE_reinterpret_cast (void*, this);
else if (type == ACE_reinterpret_cast
(ptr_arith_t,
@@ -28090,789 +13430,218 @@
this
)
);
-@@ -22221,12 +14144,12 @@
+@@ -22483,12 +22018,12 @@
return retv;
}
-const char* IR::WstringDef::_interface_repository_id (void) const
-+const char* IR_ArrayDef::_interface_repository_id (void) const
++const char* IR_WstringDef::_interface_repository_id (void) const
{
-- return "IDL:omg.org/IR/WstringDef:1.0";
-+ return "IDL:omg.org/IR/ArrayDef:1.0";
+ return "IDL:omg.org/IR/WstringDef:1.0";
}
-CORBA::ULong IR::WstringDef::bound (
-+CORBA::ULong IR_ArrayDef::length (
++CORBA::ULong IR_WstringDef::bound (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -22234,14 +14157,14 @@
- ))
- {
-
-- return this->the_TAO_WstringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).bound (
-+ return this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).length (
- this,
- ACE_TRY_ENV
+@@ -22505,7 +22040,7 @@
);
}
-void IR::WstringDef::bound (
-- CORBA::ULong bound,
-+void IR_ArrayDef::length (
-+ CORBA::ULong length,
++void IR_WstringDef::bound (
+ CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
-@@ -22249,152 +14172,82 @@
- ))
- {
-
-- this->the_TAO_WstringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).bound (
-+ this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).length (
- this,
-- bound,
-+ length,
- ACE_TRY_ENV
+@@ -22524,9 +22059,8 @@
);
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::TAO_ClientRequestInfo_IR_WstringDef_bound_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-+CORBA::TypeCode_ptr IR_ArrayDef::element_type (
-+ CORBA::Environment &ACE_TRY_ENV
- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::TAO_ClientRequestInfo_IR_WstringDef_bound_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -22535,7 +22069,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -22547,7 +22081,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -22560,7 +22094,7 @@
+
+
+ CORBA::Any *
-IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
-
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -22576,13 +22110,13 @@
+ }
+
+ void
-IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::result (CORBA::ULong result)
--{
-- // update the result
-- this->_result = result;
-+ return this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).element_type (
-+ this,
-+ ACE_TRY_ENV
-+ );
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const CORBA::ULong & bound,
-- CORBA::Environment &
-+IR_IDLType_ptr IR_ArrayDef::element_type_def (
-+ CORBA::Environment &ACE_TRY_ENV
- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- bound_ (bound)
--{}
--
--Dynamic::ParameterList *
++IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::TAO_ClientRequestInfo_IR_WstringDef_bound_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const CORBA::ULong & bound,
+@@ -22593,7 +22127,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_bound = parameter_list->length ();
-- parameter_list->length (length_bound + 1);
-- (*parameter_list)[length_bound].argument <<= bound_;
-- (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
--IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return exception_list;
-+ return this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).element_type_def (
-+ this,
-+ ACE_TRY_ENV
-+ );
++IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -22612,7 +22146,7 @@
}
--
--CORBA::Any *
+ Dynamic::ExceptionList *
+-IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
++IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -22625,7 +22159,7 @@
+
+
+ CORBA::Any *
-IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void IR_ArrayDef::element_type_def (
-+ IR_IDLType_ptr element_type_def,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return result_any;
-+ this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).element_type_def (
-+ this,
-+ element_type_def,
-+ ACE_TRY_ENV
-+ );
++IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -22638,13 +22172,14 @@
}
--#endif /* TAO_HAS_INTERCEPTORS */
--static const CORBA::Long _oc_IR_WstringDef[] =
-+static const CORBA::Long _oc_IR_ArrayDef[] =
+ #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
+ 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
-+ 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 = IR_ArrayDef
++ 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_ArrayDef (CORBA::tk_objref, sizeof (_oc_IR_ArrayDef), (char *) &_oc_IR_ArrayDef, 0, sizeof (IR_ArrayDef));
++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)
-+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ArrayDef, &_tc_TAO_tc_IR_ArrayDef)
- TAO_NAMESPACE_END
-
- ///////////////////////////////////////////////////////////////////////
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_WstringDef, &_tc_TAO_tc_IR_WstringDef)
+@@ -22654,15 +22189,15 @@
// Base & Remote Proxy Implementation.
//
-IR::_TAO_FixedDef_Proxy_Impl::_TAO_FixedDef_Proxy_Impl (void)
-+_TAO_ExceptionDef_Proxy_Impl::_TAO_ExceptionDef_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_ExceptionDef_Remote_Proxy_Impl::_TAO_ExceptionDef_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::TypeCode_ptr _TAO_ExceptionDef_Remote_Proxy_Impl::type (
++CORBA::UShort _TAO_FixedDef_Remote_Proxy_Impl::digits (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -22403,158 +14256,69 @@
- ))
- {
-
-- CORBA::UShort _tao_retval = 0;
-+ 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 (), _tao_retval);
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-
- TAO_GIOP_Twoway_Invocation _tao_call (
- istub,
-- "_get_digits",
-- 11,
-+ "_get_type",
-+ 9,
- 0,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -22699,7 +22234,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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)
-- ))
-- {
-- TAO_INTERCEPTOR_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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ 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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ 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)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_retval;
-+ return _tao_safe_retval._retn ();
++ IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -22820,7 +22355,7 @@
+ return _tao_retval;
}
-void IR::_TAO_FixedDef_Remote_Proxy_Impl::digits (
-+IR_StructMemberSeq * _TAO_ExceptionDef_Remote_Proxy_Impl::members (
++void _TAO_FixedDef_Remote_Proxy_Impl::digits (
CORBA_Object *_collocated_tao_target_,
-- CORBA::UShort digits,
+ CORBA::UShort digits,
CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
-@@ -22562,456 +14326,128 @@
+@@ -22829,15 +22364,10 @@
+ CORBA::SystemException
))
{
-
+-
-
-+ IR_StructMemberSeq *_tao_retval = 0;
-
-
+-
+-
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
-- ACE_THROW (CORBA::INTERNAL ());
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ ACE_THROW (CORBA::INTERNAL ());
-
-+ ACE_NEW_RETURN (_tao_retval, IR_StructMemberSeq, _tao_retval);
-+ IR_StructMemberSeq_var _tao_safe_retval (_tao_retval);
+-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
-- "_set_digits",
-- 11,
-- 1,
-+ "_get_members",
-+ 12,
-+ 0,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ "_set_digits",
+@@ -22858,7 +22388,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- digits,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << digits)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-+ 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_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ 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)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
--
-- break;
-- }
--
--}
--
++ IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ digits,
+@@ -22972,7 +22502,7 @@
+
+ }
+
-CORBA::Short IR::_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 = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
--
--
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_get_scale",
-- 10,
-- 0,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++CORBA::Short _TAO_FixedDef_Remote_Proxy_Impl::scale (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -23009,7 +22539,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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)
-- ))
-- {
-- TAO_INTERCEPTOR_THROW_RETURN (
-+ 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),
-- _tao_retval
-+ 0
- );
--
-- }
--
-- TAO_INTERCEPTOR (
-- CORBA::Short _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_retval;
-+ return _tao_safe_retval._retn ();
++ IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -23130,7 +22660,7 @@
+ return _tao_retval;
}
-void IR::_TAO_FixedDef_Remote_Proxy_Impl::scale (
-+void _TAO_ExceptionDef_Remote_Proxy_Impl::members (
++void _TAO_FixedDef_Remote_Proxy_Impl::scale (
CORBA_Object *_collocated_tao_target_,
-- CORBA::Short scale,
-+ const IR_StructMemberSeq & members,
+ CORBA::Short scale,
CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
+@@ -23139,15 +22669,10 @@
CORBA::SystemException
))
{
@@ -28887,322 +13656,164 @@
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
-- "_set_scale",
-- 10,
-+ "_set_members",
-+ 12,
- 1,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- scale,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << scale)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-+ ACE_CHECK;
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << members)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
+ "_set_scale",
+@@ -23168,7 +22693,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
- }
--
-- break;
-- }
--
-+
-+ break;
-+ }
- }
-
-
-@@ -23024,32 +14460,32 @@
+ #if TAO_HAS_INTERCEPTORS == 1
+- IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set ri (
++ IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ scale,
+@@ -23292,37 +22817,37 @@
// Remote & Base Proxy Broker Implementation
//
-IR::_TAO_FixedDef_Proxy_Broker::_TAO_FixedDef_Proxy_Broker (void)
-+_TAO_ExceptionDef_Proxy_Broker::_TAO_ExceptionDef_Proxy_Broker (void)
++_TAO_FixedDef_Proxy_Broker::_TAO_FixedDef_Proxy_Broker (void)
{
}
-IR::_TAO_FixedDef_Proxy_Broker::~_TAO_FixedDef_Proxy_Broker (void)
-+_TAO_ExceptionDef_Proxy_Broker::~_TAO_ExceptionDef_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_ExceptionDef_Remote_Proxy_Broker *the_TAO_ExceptionDef_Remote_Proxy_Broker (void)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_FixedDef_Remote_Proxy_Broker *
+-IR::_TAO_FixedDef_Remote_Proxy_Broker::the_TAO_FixedDef_Remote_Proxy_Broker (void)
++_TAO_FixedDef_Remote_Proxy_Broker *
++_TAO_FixedDef_Remote_Proxy_Broker::the_TAO_FixedDef_Remote_Proxy_Broker (void)
{
- static ::IR::_TAO_FixedDef_Remote_Proxy_Broker remote_proxy_broker;
-+ static ::_TAO_ExceptionDef_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_ExceptionDef_Remote_Proxy_Broker::_TAO_ExceptionDef_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_ExceptionDef_Remote_Proxy_Broker::~_TAO_ExceptionDef_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_ExceptionDef_Proxy_Impl&
-+_TAO_ExceptionDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_ExceptionDef *object,
++_TAO_FixedDef_Proxy_Impl&
++_TAO_FixedDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_FixedDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -23065,113 +14501,116 @@
+@@ -23338,109 +22863,109 @@
// default constructor
-IR::FixedDef::FixedDef (int collocated)
-+IR_ExceptionDef::IR_ExceptionDef (int collocated)
++IR_FixedDef::IR_FixedDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_FixedDef_setup_collocation (collocated);
}
// destructor
-IR::FixedDef::~FixedDef (void)
-+IR_ExceptionDef::~IR_ExceptionDef (void)
++IR_FixedDef::~IR_FixedDef (void)
{}
void
--IR::FixedDef::_tao_setup_collocation (int collocated)
-+IR_ExceptionDef::_tao_setup_collocation (int collocated)
+-IR::FixedDef::IR_FixedDef_setup_collocation (int collocated)
++IR_FixedDef::IR_FixedDef_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_FixedDef_Proxy_Broker_ =
+ this->the_TAO_FixedDef_Proxy_Broker_ =
- ::IR__TAO_FixedDef_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_ExceptionDef_Proxy_Broker_ =
-+ _TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_FixedDef_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_FixedDef_Proxy_Broker_ =
+ this->the_TAO_FixedDef_Proxy_Broker_ =
- ::IR::_TAO_FixedDef_Remote_Proxy_Broker::the_TAO_FixedDef_Remote_Proxy_Broker ();
-+ this->the_TAO_ExceptionDef_Proxy_Broker_ =
-+ ::the_TAO_ExceptionDef_Remote_Proxy_Broker ();
-+
-+ IR_Contained::_tao_setup_collocation (collocated);
-+ IR_Container::_tao_setup_collocation (collocated);
++ _TAO_FixedDef_Remote_Proxy_Broker::the_TAO_FixedDef_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (IR, IDLType)::_tao_setup_collocation (collocated);
+ this->IR_IDLType_setup_collocation (collocated);
}
-void IR::FixedDef::_tao_any_destructor (void *x)
-+void IR_ExceptionDef::_tao_any_destructor (void *x)
++void IR_FixedDef::_tao_any_destructor (void *x)
{
- FixedDef *tmp = ACE_static_cast (FixedDef*,x);
-+ IR_ExceptionDef *tmp = ACE_static_cast (IR_ExceptionDef*,x);
++ IR_FixedDef *tmp = ACE_static_cast (IR_FixedDef*,x);
CORBA::release (tmp);
}
-IR::FixedDef_ptr IR::FixedDef::_narrow (
-+IR_ExceptionDef_ptr IR_ExceptionDef::_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_ExceptionDef::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FixedDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (FixedDef::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ExceptionDef:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_ExceptionDef::_nil ());
++ ACE_CHECK_RETURN (IR_FixedDef::_nil ());
if (is_a == 0)
- return FixedDef::_nil ();
-+ return IR_ExceptionDef::_nil ();
++ return IR_FixedDef::_nil ();
}
- return FixedDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_ExceptionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_FixedDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::FixedDef_ptr IR::FixedDef::_unchecked_narrow (
-+IR_ExceptionDef_ptr IR_ExceptionDef::_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_ExceptionDef::_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_ExceptionDef_ptr default_proxy = IR_ExceptionDef::_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_ExceptionDef_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_ExceptionDef (
++ ::IR_FixedDef (
stub,
1,
obj->_servant ()),
- FixedDef::_nil ());
-+ IR_ExceptionDef::_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_ExceptionDef (stub, 0, obj->_servant ()), IR_ExceptionDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_FixedDef (stub, 0, obj->_servant ()), IR_FixedDef::_nil ());
return default_proxy;
}
else
@@ -29210,14 +13821,14 @@
ACE_reinterpret_cast
(
- FixedDef_ptr,
-+ IR_ExceptionDef_ptr,
++ IR_FixedDef_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &FixedDef::_narrow
-+ &IR_ExceptionDef::_narrow
++ &IR_FixedDef::_narrow
)
)
);
@@ -29225,8 +13836,8 @@
-IR::FixedDef_ptr
-IR::FixedDef::_duplicate (FixedDef_ptr obj)
-+IR_ExceptionDef_ptr
-+IR_ExceptionDef::_duplicate (IR_ExceptionDef_ptr obj)
++IR_FixedDef_ptr
++IR_FixedDef::_duplicate (IR_FixedDef_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -29234,53 +13845,34 @@
}
-CORBA::Boolean IR::FixedDef::_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)
++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/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
-@@ -23179,34 +14618,46 @@
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FixedDef:1.0")) ||
+@@ -23452,34 +22977,34 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::FixedDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_ExceptionDef::_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_ExceptionDef::_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_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))
++ &IR_IDLType::_narrow))
retv = ACE_reinterpret_cast
(
void *,
ACE_static_cast
(
- IR::IDLType_ptr,
-+ IR_Container_ptr,
++ IR_IDLType_ptr,
this
)
);
@@ -29298,1464 +13890,352 @@
this
)
);
-@@ -23219,12 +14670,12 @@
+@@ -23492,12 +23017,12 @@
return retv;
}
-const char* IR::FixedDef::_interface_repository_id (void) const
-+const char* IR_ExceptionDef::_interface_repository_id (void) const
++const char* IR_FixedDef::_interface_repository_id (void) const
{
-- return "IDL:omg.org/IR/FixedDef:1.0";
-+ return "IDL:omg.org/IR/ExceptionDef:1.0";
+ return "IDL:omg.org/IR/FixedDef:1.0";
}
-CORBA::UShort IR::FixedDef::digits (
-+CORBA::TypeCode_ptr IR_ExceptionDef::type (
++CORBA::UShort IR_FixedDef::digits (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -23232,14 +14683,13 @@
- ))
- {
-
-- return this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).digits (
-+ return this->the_TAO_ExceptionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type (
- this,
- ACE_TRY_ENV
+@@ -23514,7 +23039,7 @@
);
}
-void IR::FixedDef::digits (
-- CORBA::UShort digits,
-+IR_StructMemberSeq * IR_ExceptionDef::members (
++void IR_FixedDef::digits (
+ CORBA::UShort digits,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
-@@ -23247,14 +14697,14 @@
- ))
- {
-
-- this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).digits (
-+ return this->the_TAO_ExceptionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
- this,
-- digits,
- ACE_TRY_ENV
+@@ -23533,7 +23058,7 @@
);
}
-CORBA::Short IR::FixedDef::scale (
-+void IR_ExceptionDef::members (
-+ const IR_StructMemberSeq & members,
++CORBA::Short IR_FixedDef::scale (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -23262,278 +14712,396 @@
- ))
- {
-
-- return this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).scale (
-+ this->the_TAO_ExceptionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
- this,
-+ members,
- ACE_TRY_ENV
+@@ -23550,7 +23075,7 @@
);
}
-void IR::FixedDef::scale (
-- CORBA::Short scale,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+static const CORBA::Long _oc_IR_ExceptionDef[] =
- {
--
-- this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).scale (
-- this,
-- scale,
-- ACE_TRY_ENV
-- );
--}
-+ 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 = 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
-+ 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 = ExceptionDescription
-+ 5, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
++void IR_FixedDef::scale (
+ CORBA::Short scale,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -23569,9 +23094,8 @@
+ );
+ }
--#if (TAO_HAS_INTERCEPTORS == 1)
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::TAO_ClientRequestInfo_IR_FixedDef_digits_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
++IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::TAO_ClientRequestInfo_IR_FixedDef_digits_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -23580,7 +23104,7 @@
+ {}
--Dynamic::ParameterList *
+ Dynamic::ParameterList *
-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+ 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
++IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -23592,7 +23116,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
++IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -23605,7 +23129,7 @@
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
--CORBA::Any *
+ CORBA::Any *
-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
-+};
-+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
++IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -23621,13 +23145,13 @@
+ }
--void
+ void
-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::result (CORBA::UShort result)
-+void IR_ExceptionDescription::_tao_any_destructor (void *x)
++IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::result (CORBA::UShort result)
{
-- // update the result
-- this->_result = result;
-+ IR_ExceptionDescription *tmp = ACE_static_cast (IR_ExceptionDescription*,x);
-+ delete tmp;
+ // update the result
+ this->_result = result;
}
-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::TAO_ClientRequestInfo_IR_FixedDef_digits_set (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const CORBA::UShort & digits,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- digits_ (digits)
--{}
--
--Dynamic::ParameterList *
++IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::TAO_ClientRequestInfo_IR_FixedDef_digits_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const CORBA::UShort & digits,
+@@ -23638,7 +23162,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-+ // 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);
-
-- CORBA::ULong length_digits = parameter_list->length ();
-- parameter_list->length (length_digits + 1);
-- (*parameter_list)[length_digits].argument <<= digits_;
-- (*parameter_list)[length_digits].mode = Dynamic::PARAM_IN;
-+ if (this->buffer_ != 0)
-+ {
-+ 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]);
-+ else
-+ tmp[i] = old[i];
-+
-+ if (this->release_)
-+ delete[] old;
-+
-+ }
-+ this->buffer_ = tmp;
-+ }
-
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -23657,7 +23181,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ 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_);
-+ for (CORBA::ULong i = 0; i < this->length_; ++i)
-+ {
-+ CORBA::release (tmp[i]);
-+ tmp[i] = IR_ExceptionDef::_nil ();
-+ }
-+ _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::freebuf (tmp);
-+ this->buffer_ = 0;
-+ }
-
-- return exception_list;
--}
--
-+ _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
-+ _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_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -23670,7 +23194,7 @@
--CORBA::Any *
+
+ CORBA::Any *
-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ CORBA_Object*
-+ _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_upcast (void *src) const
-+ {
-+ IR_ExceptionDef **tmp = ACE_static_cast (IR_ExceptionDef**, src);
-+ return *tmp;
-+ }
-
-- return result_any;
--}
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
++IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -23682,7 +23206,7 @@
+ return result_any;
+ }
-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::TAO_ClientRequestInfo_IR_FixedDef_scale_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
-+// *************************************************************
-+// IR_ExceptionDefSeq
-+// *************************************************************
++IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::TAO_ClientRequestInfo_IR_FixedDef_scale_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -23691,7 +23215,7 @@
+ {}
--Dynamic::ParameterList *
+ Dynamic::ParameterList *
-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+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 */
-+ (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 */
-+ (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 */
-+ (seq)
-+{}
-+IR_ExceptionDefSeq::~IR_ExceptionDefSeq (void) // dtor
-+{}
-+void IR_ExceptionDefSeq::_tao_any_destructor (void *x)
++IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
-+ IR_ExceptionDefSeq *tmp = ACE_static_cast (IR_ExceptionDefSeq*,x);
-+ delete tmp;
+ // Generate the argument list on demand.
+@@ -23703,7 +23227,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+static const CORBA::Long _oc_IR_ExceptionDefSeq[] =
++IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ 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 = ExceptionDefSeq
-+ 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 (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 = IR_ExceptionDef
+ // Generate the exception list on demand.
+@@ -23716,7 +23240,7 @@
-+ 0U,
--CORBA::Any *
+ CORBA::Any *
-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+};
-+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)
-+TAO_NAMESPACE_END
-+
-+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-- CORBA::Any_var safe_result_any = result_any;
-+ 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;
-+ }
-
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
-+ 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 /* !TAO_USE_SEQUENCE_TEMPLATES */
++IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -23732,13 +23256,13 @@
+ }
--void
+ void
-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::result (CORBA::Short result)
--{
-- // update the result
-- this->_result = result;
--}
-+// *************************************************************
-+// IR_ExcDescriptionSeq
-+// *************************************************************
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const CORBA::Short & scale,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- scale_ (scale)
-+IR_ExcDescriptionSeq::IR_ExcDescriptionSeq (void)
++IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::TAO_ClientRequestInfo_IR_FixedDef_scale_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const CORBA::Short & scale,
+@@ -23749,7 +23273,7 @@
{}
--
--Dynamic::ParameterList *
+
+ Dynamic::ParameterList *
-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+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 */
-+ (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 */
-+ (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 */
-+ (seq)
-+{}
-+IR_ExcDescriptionSeq::~IR_ExcDescriptionSeq (void) // dtor
-+{}
-+void IR_ExcDescriptionSeq::_tao_any_destructor (void *x)
++IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_scale = parameter_list->length ();
-- parameter_list->length (length_scale + 1);
-- (*parameter_list)[length_scale].argument <<= scale_;
-- (*parameter_list)[length_scale].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ IR_ExcDescriptionSeq *tmp = ACE_static_cast (IR_ExcDescriptionSeq*,x);
-+ delete tmp;
+ // Generate the argument list on demand.
+@@ -23768,7 +23292,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+static const CORBA::Long _oc_IR_ExcDescriptionSeq[] =
++IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ 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 = ExcDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 456, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = ExceptionDescription
-+ 5, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
--CORBA::Any *
+ // Generate the exception list on demand.
+@@ -23781,7 +23305,7 @@
+
+
+ CORBA::Any *
-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
-+ 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
++IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -23794,13 +23318,14 @@
+ }
--#endif /* TAO_HAS_INTERCEPTORS */
--static const CORBA::Long _oc_IR_FixedDef[] =
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
+ #endif /* TAO_HAS_INTERCEPTORS */
+
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
-+
-+
-+ 0U,
-+
-+};
-+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[] =
+ 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
+ 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
-+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/AttributeMode:1.0
-+ 14, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x654d6f64), ACE_NTOHL (0x65000000), // name = AttributeMode
-+ 2, // member count
-+ 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
++ 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_AttributeMode (CORBA::tk_enum, sizeof (_oc_IR_AttributeMode), (char *) &_oc_IR_AttributeMode, 0, sizeof (IR_AttributeMode));
++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)
-+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttributeMode, &_tc_TAO_tc_IR_AttributeMode)
- TAO_NAMESPACE_END
-
- ///////////////////////////////////////////////////////////////////////
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FixedDef, &_tc_TAO_tc_IR_FixedDef)
+@@ -23810,15 +23335,15 @@
// Base & Remote Proxy Implementation.
//
-IR::_TAO_SequenceDef_Proxy_Impl::_TAO_SequenceDef_Proxy_Impl (void)
-+_TAO_AttributeDef_Proxy_Impl::_TAO_AttributeDef_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_AttributeDef_Remote_Proxy_Impl::_TAO_AttributeDef_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::TypeCode_ptr _TAO_AttributeDef_Remote_Proxy_Impl::type (
++CORBA::ULong _TAO_SequenceDef_Remote_Proxy_Impl::bound (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -23542,158 +15110,69 @@
- ))
- {
-
-- CORBA::ULong _tao_retval = 0;
-+ 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 (), _tao_retval);
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-
- TAO_GIOP_Twoway_Invocation _tao_call (
- istub,
-- "_get_bound",
-- 10,
-- 0,
-+ "_get_type",
-+ 9,
-+ 0,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -23855,7 +23380,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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)
-- ))
-- {
-- TAO_INTERCEPTOR_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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ 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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ 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)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_retval;
-+ return _tao_safe_retval._retn ();
++ IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -23976,7 +23501,7 @@
+ return _tao_retval;
}
-void IR::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
-+IR_IDLType_ptr _TAO_AttributeDef_Remote_Proxy_Impl::type_def (
++void _TAO_SequenceDef_Remote_Proxy_Impl::bound (
CORBA_Object *_collocated_tao_target_,
-- CORBA::ULong bound,
+ CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
-@@ -23701,309 +15180,130 @@
+@@ -23985,15 +23510,10 @@
+ CORBA::SystemException
))
{
-
+-
-
-+ 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 (CORBA::INTERNAL ());
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ ACE_THROW (CORBA::INTERNAL ());
-
+-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
-- "_set_bound",
-- 10,
-- 1,
-+ "_get_type_def",
-+ 13,
-+ 0,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ "_set_bound",
+@@ -24014,7 +23534,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- bound,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << bound)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ 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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ 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)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
-+ return _tao_safe_retval._retn ();
++ IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ bound,
+@@ -24128,7 +23648,7 @@
+
}
-CORBA::TypeCode_ptr IR::_TAO_SequenceDef_Remote_Proxy_Impl::element_type (
-+void _TAO_AttributeDef_Remote_Proxy_Impl::type_def (
++CORBA::TypeCode_ptr _TAO_SequenceDef_Remote_Proxy_Impl::element_type (
CORBA_Object *_collocated_tao_target_,
-+ IR_IDLType_ptr type_def,
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);
-+ ACE_THROW (CORBA::INTERNAL ());
-
--
- TAO_GIOP_Twoway_Invocation _tao_call (
- istub,
-- "_get_element_type",
-- 17,
-- 0,
-+ "_set_type_def",
-+ 13,
-+ 1,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-+ ACE_CHECK;
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << type_def)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
+@@ -24166,7 +23686,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
-+
-+ break;
-+ }
+ #if TAO_HAS_INTERCEPTORS == 1
+- IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get ri (
++ IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -24288,7 +23808,7 @@
+ return _tao_safe_retval._retn ();
}
-IR::IDLType_ptr IR::_TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
-+IR_AttributeMode _TAO_AttributeDef_Remote_Proxy_Impl::mode (
++IR_IDLType_ptr _TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -24012,307 +15312,126 @@
+@@ -24297,8 +23817,8 @@
))
{
- IR::IDLType_ptr _tao_retval = IR::IDLType::_nil ();
- IR::IDLType_var _tao_safe_retval (_tao_retval);
-+ IR_AttributeMode _tao_retval = (IR_AttributeMode)0;
++ 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);
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
- TAO_GIOP_Twoway_Invocation _tao_call (
- istub,
-- "_get_element_type_def",
-- 21,
-+ "_get_mode",
-+ 9,
- 0,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -24326,7 +23846,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -24382,7 +23902,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ ACE_CHECK_RETURN (_tao_retval);
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ _tao_retval
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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
-+ );
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
-+ return _tao_retval;
++ IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -24448,24 +23968,19 @@
+ return _tao_safe_retval._retn ();
}
-void IR::_TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
-+void _TAO_AttributeDef_Remote_Proxy_Impl::mode (
++void _TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
CORBA_Object *_collocated_tao_target_,
- IR::IDLType_ptr element_type_def,
-+ IR_AttributeMode mode,
++ IR_IDLType_ptr element_type_def,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
@@ -30773,321 +14253,164 @@
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
-- "_set_element_type_def",
-- 21,
-+ "_set_mode",
-+ 9,
- 1,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- element_type_def,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << element_type_def)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-+ ACE_CHECK;
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << mode)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
+ "_set_element_type_def",
+@@ -24486,7 +24001,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
- }
--
-- break;
-- }
--
-+
-+ break;
-+ }
- }
-
-
-@@ -24325,32 +15444,32 @@
+ #if TAO_HAS_INTERCEPTORS == 1
+- IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set ri (
++ IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ element_type_def,
+@@ -24610,37 +24125,37 @@
// Remote & Base Proxy Broker Implementation
//
-IR::_TAO_SequenceDef_Proxy_Broker::_TAO_SequenceDef_Proxy_Broker (void)
-+_TAO_AttributeDef_Proxy_Broker::_TAO_AttributeDef_Proxy_Broker (void)
++_TAO_SequenceDef_Proxy_Broker::_TAO_SequenceDef_Proxy_Broker (void)
{
}
-IR::_TAO_SequenceDef_Proxy_Broker::~_TAO_SequenceDef_Proxy_Broker (void)
-+_TAO_AttributeDef_Proxy_Broker::~_TAO_AttributeDef_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_AttributeDef_Remote_Proxy_Broker *the_TAO_AttributeDef_Remote_Proxy_Broker (void)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_SequenceDef_Remote_Proxy_Broker *
+-IR::_TAO_SequenceDef_Remote_Proxy_Broker::the_TAO_SequenceDef_Remote_Proxy_Broker (void)
++_TAO_SequenceDef_Remote_Proxy_Broker *
++_TAO_SequenceDef_Remote_Proxy_Broker::the_TAO_SequenceDef_Remote_Proxy_Broker (void)
{
- static ::IR::_TAO_SequenceDef_Remote_Proxy_Broker remote_proxy_broker;
-+ static ::_TAO_AttributeDef_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_AttributeDef_Remote_Proxy_Broker::_TAO_AttributeDef_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_AttributeDef_Remote_Proxy_Broker::~_TAO_AttributeDef_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_AttributeDef_Proxy_Impl&
-+_TAO_AttributeDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_AttributeDef *object,
++_TAO_SequenceDef_Proxy_Impl&
++_TAO_SequenceDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_SequenceDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -24366,113 +15485,114 @@
+@@ -24656,109 +24171,109 @@
// default constructor
-IR::SequenceDef::SequenceDef (int collocated)
-+IR_AttributeDef::IR_AttributeDef (int collocated)
++IR_SequenceDef::IR_SequenceDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_SequenceDef_setup_collocation (collocated);
}
// destructor
-IR::SequenceDef::~SequenceDef (void)
-+IR_AttributeDef::~IR_AttributeDef (void)
++IR_SequenceDef::~IR_SequenceDef (void)
{}
void
--IR::SequenceDef::_tao_setup_collocation (int collocated)
-+IR_AttributeDef::_tao_setup_collocation (int collocated)
+-IR::SequenceDef::IR_SequenceDef_setup_collocation (int collocated)
++IR_SequenceDef::IR_SequenceDef_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_SequenceDef_Proxy_Broker_ =
+ this->the_TAO_SequenceDef_Proxy_Broker_ =
- ::IR__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_AttributeDef_Proxy_Broker_ =
-+ _TAO_AttributeDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_SequenceDef_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_SequenceDef_Proxy_Broker_ =
+ this->the_TAO_SequenceDef_Proxy_Broker_ =
- ::IR::_TAO_SequenceDef_Remote_Proxy_Broker::the_TAO_SequenceDef_Remote_Proxy_Broker ();
-+ this->the_TAO_AttributeDef_Proxy_Broker_ =
-+ ::the_TAO_AttributeDef_Remote_Proxy_Broker ();
-+
-+ IR_Contained::_tao_setup_collocation (collocated);
++ _TAO_SequenceDef_Remote_Proxy_Broker::the_TAO_SequenceDef_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (IR, IDLType)::_tao_setup_collocation (collocated);
+ this->IR_IDLType_setup_collocation (collocated);
}
-void IR::SequenceDef::_tao_any_destructor (void *x)
-+void IR_AttributeDef::_tao_any_destructor (void *x)
++void IR_SequenceDef::_tao_any_destructor (void *x)
{
- SequenceDef *tmp = ACE_static_cast (SequenceDef*,x);
-+ IR_AttributeDef *tmp = ACE_static_cast (IR_AttributeDef*,x);
++ IR_SequenceDef *tmp = ACE_static_cast (IR_SequenceDef*,x);
CORBA::release (tmp);
}
-IR::SequenceDef_ptr IR::SequenceDef::_narrow (
-+IR_AttributeDef_ptr IR_AttributeDef::_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_AttributeDef::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/SequenceDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (SequenceDef::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/AttributeDef:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_AttributeDef::_nil ());
++ ACE_CHECK_RETURN (IR_SequenceDef::_nil ());
if (is_a == 0)
- return SequenceDef::_nil ();
-+ return IR_AttributeDef::_nil ();
++ return IR_SequenceDef::_nil ();
}
- return SequenceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_AttributeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_SequenceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::SequenceDef_ptr IR::SequenceDef::_unchecked_narrow (
-+IR_AttributeDef_ptr IR_AttributeDef::_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_AttributeDef::_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_AttributeDef_ptr default_proxy = IR_AttributeDef::_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_AttributeDef_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_AttributeDef (
++ ::IR_SequenceDef (
stub,
1,
obj->_servant ()),
- SequenceDef::_nil ());
-+ IR_AttributeDef::_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_AttributeDef (stub, 0, obj->_servant ()), IR_AttributeDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_SequenceDef (stub, 0, obj->_servant ()), IR_SequenceDef::_nil ());
return default_proxy;
}
else
@@ -31095,14 +14418,14 @@
ACE_reinterpret_cast
(
- SequenceDef_ptr,
-+ IR_AttributeDef_ptr,
++ IR_SequenceDef_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &SequenceDef::_narrow
-+ &IR_AttributeDef::_narrow
++ &IR_SequenceDef::_narrow
)
)
);
@@ -31110,8 +14433,8 @@
-IR::SequenceDef_ptr
-IR::SequenceDef::_duplicate (SequenceDef_ptr obj)
-+IR_AttributeDef_ptr
-+IR_AttributeDef::_duplicate (IR_AttributeDef_ptr obj)
++IR_SequenceDef_ptr
++IR_SequenceDef::_duplicate (IR_SequenceDef_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -31119,40 +14442,34 @@
}
-CORBA::Boolean IR::SequenceDef::_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)
++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/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
-@@ -24480,34 +15600,34 @@
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/SequenceDef:1.0")) ||
+@@ -24770,34 +24285,34 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::SequenceDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_AttributeDef::_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_AttributeDef::_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_Contained::_narrow))
++ &IR_IDLType::_narrow))
retv = ACE_reinterpret_cast
(
void *,
ACE_static_cast
(
- IR::IDLType_ptr,
-+ IR_Contained_ptr,
++ IR_IDLType_ptr,
this
)
);
@@ -31170,3429 +14487,1199 @@
this
)
);
-@@ -24520,12 +15640,12 @@
+@@ -24810,12 +24325,12 @@
return retv;
}
-const char* IR::SequenceDef::_interface_repository_id (void) const
-+const char* IR_AttributeDef::_interface_repository_id (void) const
++const char* IR_SequenceDef::_interface_repository_id (void) const
{
-- return "IDL:omg.org/IR/SequenceDef:1.0";
-+ return "IDL:omg.org/IR/AttributeDef:1.0";
+ return "IDL:omg.org/IR/SequenceDef:1.0";
}
-CORBA::ULong IR::SequenceDef::bound (
-+CORBA::TypeCode_ptr IR_AttributeDef::type (
++CORBA::ULong IR_SequenceDef::bound (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -24533,14 +15653,13 @@
- ))
- {
-
-- return this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).bound (
-+ return this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type (
- this,
- ACE_TRY_ENV
+@@ -24832,7 +24347,7 @@
);
}
-void IR::SequenceDef::bound (
-- CORBA::ULong bound,
-+IR_IDLType_ptr IR_AttributeDef::type_def (
++void IR_SequenceDef::bound (
+ CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
-@@ -24548,14 +15667,14 @@
- ))
- {
-
-- this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).bound (
-+ return this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type_def (
- this,
-- bound,
- ACE_TRY_ENV
+@@ -24851,7 +24366,7 @@
);
}
-CORBA::TypeCode_ptr IR::SequenceDef::element_type (
-+void IR_AttributeDef::type_def (
-+ IR_IDLType_ptr type_def,
++CORBA::TypeCode_ptr IR_SequenceDef::element_type (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -24563,13 +15682,14 @@
- ))
- {
-
-- return this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).element_type (
-+ this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type_def (
- this,
-+ type_def,
- ACE_TRY_ENV
+@@ -24868,7 +24383,7 @@
);
}
-IR::IDLType_ptr IR::SequenceDef::element_type_def (
-+IR_AttributeMode IR_AttributeDef::mode (
++IR_IDLType_ptr IR_SequenceDef::element_type_def (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -24577,14 +15697,14 @@
- ))
- {
-
-- return this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).element_type_def (
-+ return this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).mode (
- this,
- ACE_TRY_ENV
+@@ -24885,8 +24400,8 @@
);
}
-void IR::SequenceDef::element_type_def (
- IR::IDLType_ptr element_type_def,
-+void IR_AttributeDef::mode (
-+ IR_AttributeMode mode,
++void IR_SequenceDef::element_type_def (
++ IR_IDLType_ptr element_type_def,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -24592,952 +15712,602 @@
- ))
- {
-
-- this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).element_type_def (
-+ this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).mode (
- this,
-- element_type_def,
-+ mode,
- ACE_TRY_ENV
+@@ -24904,9 +24419,8 @@
);
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::TAO_ClientRequestInfo_IR_SequenceDef_bound_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::TAO_ClientRequestInfo_IR_SequenceDef_bound_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -24915,7 +24429,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -24927,7 +24441,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+static const CORBA::Long _oc_IR_AttributeDef[] =
++IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
-+ 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 = 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
+ // Generate the exception list on demand.
+@@ -24940,7 +24454,7 @@
+
--CORBA::Any *
+ CORBA::Any *
-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+static const CORBA::Long _oc_IR_AttributeDescription[] =
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
-+ 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 = AttributeDescription
-+ 8, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
++IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -24956,13 +24470,13 @@
+ }
--void
+ void
-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::result (CORBA::ULong result)
--{
-- // update the result
-- this->_result = result;
--}
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const CORBA::ULong & bound,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- bound_ (bound)
--{}
-+ 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
++IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::TAO_ClientRequestInfo_IR_SequenceDef_bound_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const CORBA::ULong & bound,
+@@ -24973,7 +24487,7 @@
+ {}
--Dynamic::ParameterList *
+ Dynamic::ParameterList *
-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_bound = parameter_list->length ();
-- parameter_list->length (length_bound + 1);
-- (*parameter_list)[length_bound].argument <<= bound_;
-- (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
++IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -24992,7 +24506,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
-
-+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-+ CORBA::tk_enum, // typecode kind
-+ 104, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/AttributeMode:1.0
-+ 14, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x654d6f64), ACE_NTOHL (0x65000000), // name = AttributeMode
-+ 2, // member count
-+ 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
++IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -25005,7 +24519,7 @@
+
--CORBA::Any *
+ CORBA::Any *
-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
-+ 15, ACE_NTOHL (0x6765745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = get_exceptions
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = ExcDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 456, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = ExceptionDescription
-+ 5, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
++IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -25017,7 +24531,7 @@
+ return result_any;
+ }
-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
--Dynamic::ParameterList *
++IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -25026,7 +24540,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+ 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
--Dynamic::ExceptionList *
++IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -25038,7 +24552,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
-
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
-
--CORBA::Any *
++IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -25051,7 +24565,7 @@
+
+
+ CORBA::Any *
-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
++IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -25067,13 +24581,13 @@
+ }
--void
+ void
-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::result (CORBA::TypeCode_ptr result)
--{
-- // update the result
-- this->_result = result;
--}
-+ 0U,
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
-
--Dynamic::ParameterList *
++IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -25082,7 +24596,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+ 15, ACE_NTOHL (0x7075745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = put_exceptions
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = ExcDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 456, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = ExceptionDescription
-+ 5, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-
--Dynamic::ExceptionList *
++IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -25094,7 +24608,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = 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
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
--CORBA::Any *
++IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -25107,7 +24621,7 @@
+
+
+ CORBA::Any *
-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
-
--void
++IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -25123,16 +24637,16 @@
+ }
+
+ void
-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::result (IR::IDLType_ptr result)
--{
-- // update the result
-- this->_result = result;
--}
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- IR::IDLType_ptr element_type_def,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- element_type_def_ (element_type_def)
--{}
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -25140,7 +24654,7 @@
+ {}
--Dynamic::ParameterList *
+ Dynamic::ParameterList *
-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_element_type_def = parameter_list->length ();
-- parameter_list->length (length_element_type_def + 1);
-- (*parameter_list)[length_element_type_def].argument <<= this->element_type_def_;
--
-- (*parameter_list)[length_element_type_def].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+ 0U,
++IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -25160,7 +24674,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
++IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -25173,7 +24687,7 @@
-+};
-+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
--CORBA::Any *
+ CORBA::Any *
-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void IR_AttributeDescription::_tao_any_destructor (void *x)
++IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
-+ IR_AttributeDescription *tmp = ACE_static_cast (IR_AttributeDescription*,x);
-+ delete tmp;
+ // Generate the result on demand.
+@@ -25186,13 +24700,14 @@
}
--#endif /* TAO_HAS_INTERCEPTORS */
--static const CORBA::Long _oc_IR_SequenceDef[] =
-+static const CORBA::Long _oc_IR_OperationMode[] =
+ #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
+ 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
-+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/OperationMode:1.0
-+ 14, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e4d6f64), ACE_NTOHL (0x65000000), // name = OperationMode
-+ 2, // member count
-+ 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
++ 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_OperationMode (CORBA::tk_enum, sizeof (_oc_IR_OperationMode), (char *) &_oc_IR_OperationMode, 0, sizeof (IR_OperationMode));
++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)
-+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OperationMode, &_tc_TAO_tc_IR_OperationMode)
- TAO_NAMESPACE_END
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SequenceDef, &_tc_TAO_tc_IR_SequenceDef)
+@@ -25202,15 +24717,15 @@
+ // Base & Remote Proxy Implementation.
+ //
--///////////////////////////////////////////////////////////////////////
--// Base & Remote Proxy Implementation.
--//
--
-IR::_TAO_ArrayDef_Proxy_Impl::_TAO_ArrayDef_Proxy_Impl (void)
--{}
-+static const CORBA::Long _oc_IR_ParameterMode[] =
-+{
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x6172616d), ACE_NTOHL (0x65746572), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ParameterMode:1.0
-+ 14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000), // name = ParameterMode
-+ 3, // member count
-+ 9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0), // name = PARAM_IN
-+ 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));
-+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
++_TAO_ArrayDef_Proxy_Impl::_TAO_ArrayDef_Proxy_Impl (void)
+ {}
-IR::_TAO_ArrayDef_Remote_Proxy_Impl::_TAO_ArrayDef_Remote_Proxy_Impl (void)
--{}
-+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 = ParameterDescription
-+ 4, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
++_TAO_ArrayDef_Remote_Proxy_Impl::_TAO_ArrayDef_Remote_Proxy_Impl (void)
+ {}
--// Remote Implementation of the IDL interface methods
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
+ // Remote Implementation of the IDL interface methods
-CORBA::ULong IR::_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 = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
--
--
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_get_length",
-- 11,
-- 0,
-- istub->orb_core ()
-- );
-+ 9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0), // name = type_def
-+ CORBA::tk_objref, // typecode kind
-+ 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 = IR_IDLType
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++CORBA::ULong _TAO_ArrayDef_Remote_Proxy_Impl::length (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -25247,7 +24762,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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)
-- ))
-- {
-- TAO_INTERCEPTOR_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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-+ CORBA::tk_enum, // typecode kind
-+ 116, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x6172616d), ACE_NTOHL (0x65746572), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ParameterMode:1.0
-+ 14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000), // name = ParameterMode
-+ 3, // member count
-+ 9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0), // name = PARAM_IN
-+ 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
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_retval;
--}
-+};
-+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
++ IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -25368,7 +24883,7 @@
+ return _tao_retval;
+ }
-void IR::_TAO_ArrayDef_Remote_Proxy_Impl::length (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::ULong length,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+void IR_ParameterDescription::_tao_any_destructor (void *x)
++void _TAO_ArrayDef_Remote_Proxy_Impl::length (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong length,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -25377,15 +24892,10 @@
+ CORBA::SystemException
+ ))
{
-
-
-
-
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW (CORBA::INTERNAL ());
-+ IR_ParameterDescription *tmp = ACE_static_cast (IR_ParameterDescription*,x);
-+ delete tmp;
-+}
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
-
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_set_length",
-- 11,
-- 1,
-- istub->orb_core ()
-- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-- for (;;)
-+ 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)
- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
-+ IR_ParameterDescription *old = ACE_reinterpret_cast (IR_ParameterDescription *,this->buffer_);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_length",
+@@ -25406,7 +24916,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
--#if TAO_HAS_INTERCEPTORS == 1
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- length,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << length)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
-+ for (CORBA::ULong i = 0; i < this->length_; ++i)
-+ tmp[i] = old[i];
-
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
-+ if (this->release_)
-+ _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::freebuf (old);
-
-- break;
- }
-+ this->buffer_ = tmp;
-+ }
-
--}
--
--CORBA::TypeCode_ptr IR::_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);
--
-+ 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_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
--
-+ _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::~_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (void) // Dtor.
-+ {
-+ this->_deallocate_buffer ();
-+ }
++ IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ length,
+@@ -25520,7 +25030,7 @@
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_get_element_type",
-- 17,
-- 0,
-- istub->orb_core ()
-- );
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ }
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+-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
+ )
+@@ -25558,7 +25068,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+// *************************************************************
-+// IR_ParDescriptionSeq
-+// *************************************************************
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
-+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 */
-+ (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 */
-+ (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 */
-+ (seq)
-+{}
-+IR_ParDescriptionSeq::~IR_ParDescriptionSeq (void) // dtor
-+{}
-+void IR_ParDescriptionSeq::_tao_any_destructor (void *x)
-+{
-+ IR_ParDescriptionSeq *tmp = ACE_static_cast (IR_ParDescriptionSeq*,x);
-+ delete tmp;
++ IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -25680,7 +25190,7 @@
+ return _tao_safe_retval._retn ();
}
-IR::IDLType_ptr IR::_TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+static const CORBA::Long _oc_IR_ParDescriptionSeq[] =
++IR_IDLType_ptr _TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -25689,8 +25199,8 @@
+ ))
{
--
+
- 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_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 = ParDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 404, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = ParameterDescription
-+ 4, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-
--
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_get_element_type_def",
-- 21,
-- 0,
-- istub->orb_core ()
-- );
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-+ 9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0), // name = type_def
-+ CORBA::tk_objref, // typecode kind
-+ 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 = IR_IDLType
-+
-+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-+ CORBA::tk_enum, // typecode kind
-+ 116, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x6172616d), ACE_NTOHL (0x65746572), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ParameterMode:1.0
-+ 14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000), // name = ParameterMode
-+ 3, // member count
-+ 9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0), // name = PARAM_IN
-+ 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
-+
-+
-+ 0U,
-+
-+};
-+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
-+ 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
-+ 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_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));
-+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-+TAO_NAMESPACE_BEGIN (IR)
-+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ContextIdentifier, &_tc_TAO_tc_IR_ContextIdentifier)
-+TAO_NAMESPACE_END
-+
-+// *************************************************************
-+// IR_ContextIdSeq
-+// *************************************************************
-+
-+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 */
-+ (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 */
-+ (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 */
-+ (seq)
-+{}
-+IR_ContextIdSeq::~IR_ContextIdSeq (void) // dtor
-+{}
-+void IR_ContextIdSeq::_tao_any_destructor (void *x)
-+{
-+ IR_ContextIdSeq *tmp = ACE_static_cast (IR_ContextIdSeq*,x);
-+ delete tmp;
-+}
-+
-+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 = ContextIdSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 160, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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
-+ 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_string,
-+ 0U, // string length
-+
-+
-+ 0U,
-+
-+};
-+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)
-+TAO_NAMESPACE_END
-+
-+///////////////////////////////////////////////////////////////////////
-+// Base & Remote Proxy Implementation.
-+//
-+
-+_TAO_OperationDef_Proxy_Impl::_TAO_OperationDef_Proxy_Impl (void)
-+{}
-+
-+_TAO_OperationDef_Remote_Proxy_Impl::_TAO_OperationDef_Remote_Proxy_Impl (void)
-+{}
-+
-+// 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
-+ ))
-+{
++ IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
++ IR_IDLType_var _tao_safe_retval (_tao_retval);
--#endif /* TAO_HAS_INTERCEPTORS */
-+ CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
-+ CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -25718,7 +25228,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -25774,7 +25284,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+
-+ 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",
-+ 11,
-+ 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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ 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)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -25840,24 +25350,19 @@
return _tao_safe_retval._retn ();
}
-void IR::_TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
-+IR_IDLType_ptr _TAO_OperationDef_Remote_Proxy_Impl::result_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 ((
-@@ -25545,374 +16315,264 @@
+ CORBA::SystemException
))
{
-
+-
-
-+ 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 (CORBA::INTERNAL ());
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ ACE_THROW (CORBA::INTERNAL ());
-
+-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
-- "_set_element_type_def",
-- 21,
-- 1,
-+ "_get_result_def",
-+ 15,
-+ 0,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ "_set_element_type_def",
+@@ -25878,7 +25383,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- element_type_def,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << element_type_def)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-+ 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_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ 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)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
--
-- break;
-- }
--
--}
--
--
--//
--// End Base & Remote Proxy Implemeentation.
--///////////////////////////////////////////////////////////////////////
--
--
--///////////////////////////////////////////////////////////////////////
--// Remote & Base Proxy Broker Implementation
--//
--
++ IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ element_type_def,
+@@ -26002,37 +25507,37 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
-IR::_TAO_ArrayDef_Proxy_Broker::_TAO_ArrayDef_Proxy_Broker (void)
--{
--}
-+ 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;
-+ }
++_TAO_ArrayDef_Proxy_Broker::_TAO_ArrayDef_Proxy_Broker (void)
+ {
+ }
-IR::_TAO_ArrayDef_Proxy_Broker::~_TAO_ArrayDef_Proxy_Broker (void)
--{
-+ return _tao_safe_retval._retn ();
++_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)
-+void _TAO_OperationDef_Remote_Proxy_Impl::result_def (
-+ CORBA_Object *_collocated_tao_target_,
-+ IR_IDLType_ptr result_def,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_ArrayDef_Remote_Proxy_Broker *
+-IR::_TAO_ArrayDef_Remote_Proxy_Broker::the_TAO_ArrayDef_Remote_Proxy_Broker (void)
++_TAO_ArrayDef_Remote_Proxy_Broker *
++_TAO_ArrayDef_Remote_Proxy_Broker::the_TAO_ArrayDef_Remote_Proxy_Broker (void)
{
- static ::IR::_TAO_ArrayDef_Remote_Proxy_Broker remote_proxy_broker;
-- return &remote_proxy_broker;
--}
-+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW (CORBA::INTERNAL ());
++ 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_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_set_result_def",
-+ 15,
-+ 1,
-+ istub->orb_core ()
-+ );
++_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,
-- 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
++_TAO_ArrayDef_Proxy_Impl&
++_TAO_ArrayDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_ArrayDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -26048,109 +25553,109 @@
+
+
+ // default constructor
-IR::ArrayDef::ArrayDef (int collocated)
--{
-- this->_tao_setup_collocation (collocated);
--}
--
--// destructor
++IR_ArrayDef::IR_ArrayDef (int collocated)
+ {
+ this->IR_ArrayDef_setup_collocation (collocated);
+ }
+
+ // destructor
-IR::ArrayDef::~ArrayDef (void)
--{}
--
--void
--IR::ArrayDef::_tao_setup_collocation (int collocated)
--{
-- if (collocated)
-- this->the_TAO_ArrayDef_Proxy_Broker_ =
++IR_ArrayDef::~IR_ArrayDef (void)
+ {}
+
+ void
+-IR::ArrayDef::IR_ArrayDef_setup_collocation (int collocated)
++IR_ArrayDef::IR_ArrayDef_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_ArrayDef_Proxy_Broker_ =
- ::IR__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer (this);
-- else
-- this->the_TAO_ArrayDef_Proxy_Broker_ =
++ _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 ();
--
-- ACE_NESTED_CLASS (IR, IDLType)::_tao_setup_collocation (collocated);
--}
--
++ _TAO_ArrayDef_Remote_Proxy_Broker::the_TAO_ArrayDef_Remote_Proxy_Broker ();
+
+ this->IR_IDLType_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);
-- CORBA::release (tmp);
-+ for (;;)
-+ {
-+ _tao_call.start (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 << result_def)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
-+ {
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
-+ }
-+
-+ break;
-+ }
++ IR_ArrayDef *tmp = ACE_static_cast (IR_ArrayDef*,x);
+ CORBA::release (tmp);
}
-IR::ArrayDef_ptr IR::ArrayDef::_narrow (
-- CORBA::Object_ptr obj,
-+IR_ParDescriptionSeq * _TAO_OperationDef_Remote_Proxy_Impl::params (
-+ CORBA_Object *_collocated_tao_target_,
++IR_ArrayDef_ptr IR_ArrayDef::_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &ACE_TRY_ENV
)
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
{
-- if (CORBA::is_nil (obj))
+ if (CORBA::is_nil (obj))
- return ArrayDef::_nil ();
-- if (! obj->_is_local ())
-- {
-- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ArrayDef:1.0", ACE_TRY_ENV);
++ 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 ());
-- if (is_a == 0)
++ 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);
--}
-+
-+ IR_ParDescriptionSeq *_tao_retval = 0;
-+
-+
-+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
++ return IR_ArrayDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
-IR::ArrayDef_ptr IR::ArrayDef::_unchecked_narrow (
-- CORBA::Object_ptr obj,
-- CORBA::Environment &
-- )
--{
-- if (CORBA::is_nil (obj))
++IR_ArrayDef_ptr IR_ArrayDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
- return ArrayDef::_nil ();
-- if (! obj->_is_local ())
-- {
-- TAO_Stub* stub = obj->_stubobj ();
-- if (stub)
-- stub->_incr_refcnt ();
++ return IR_ArrayDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
- ArrayDef_ptr default_proxy = ArrayDef::_nil ();
-+
-+ 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",
-+ 11,
-+ 0,
-+ istub->orb_core ()
-+ );
-
-- if (
-- !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-- stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
++ 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
-- )
-+ for (;;)
++ obj->_is_collocated () &&_TAO_ArrayDef_Proxy_Broker_Factory_function_pointer != 0
+ )
{
-- ACE_NEW_RETURN (
-- default_proxy,
+ ACE_NEW_RETURN (
+ default_proxy,
- ::IR::ArrayDef (
-- stub,
-- 1,
-- obj->_servant ()),
--
++ ::IR_ArrayDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
- ArrayDef::_nil ());
-+ _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
-+ );
++ IR_ArrayDef::_nil ());
}
-- if (CORBA::is_nil (default_proxy))
+ if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, ::IR::ArrayDef (stub, 0, obj->_servant ()), ArrayDef::_nil ());
-- return default_proxy;
-+ 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;
++ ACE_NEW_RETURN (default_proxy, ::IR_ArrayDef (stub, 0, obj->_servant ()), IR_ArrayDef::_nil ());
+ return default_proxy;
}
-- else
-- return
-- ACE_reinterpret_cast
-- (
+ else
+ return
+ ACE_reinterpret_cast
+ (
- ArrayDef_ptr,
-- obj->_tao_QueryInterface
-- (
-- ACE_reinterpret_cast
-- (
-- ptr_arith_t,
++ 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)
--{
-- if (!CORBA::is_nil (obj))
-- obj->_add_ref ();
-- return 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)
--{
-- 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);
--}
--
++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")) ||
+@@ -26162,34 +25667,34 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
-void *IR::ArrayDef::_tao_QueryInterface (ptr_arith_t type)
--{
-- void *retv = 0;
-- if (type == ACE_reinterpret_cast
-- (ptr_arith_t,
++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))
-- retv = ACE_reinterpret_cast (void*, this);
-- else 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,
- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
- IR::IDLType_ptr,
-- this
-- )
-- );
-- else if (type == ACE_reinterpret_cast
-- (ptr_arith_t,
++ 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::_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;
--}
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -26202,12 +25707,12 @@
+ return retv;
+ }
-const char* IR::ArrayDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/ArrayDef:1.0";
-+ return _tao_safe_retval._retn ();
++const char* IR_ArrayDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/ArrayDef:1.0";
}
-CORBA::ULong IR::ArrayDef::length (
-+void _TAO_OperationDef_Remote_Proxy_Impl::params (
-+ CORBA_Object *_collocated_tao_target_,
-+ const IR_ParDescriptionSeq & params,
++CORBA::ULong IR_ArrayDef::length (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
- CORBA::SystemException
- ))
- {
--
-- return this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).length (
-- this,
-- ACE_TRY_ENV
-+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW (CORBA::INTERNAL ());
-+
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_set_params",
-+ 11,
-+ 1,
-+ istub->orb_core ()
+@@ -26224,7 +25729,7 @@
);
-+
-+ for (;;)
-+ {
-+ _tao_call.start (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 << params)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
-+ {
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
-+ }
-+
-+ break;
-+ }
}
-void IR::ArrayDef::length (
-- CORBA::ULong length,
-+IR_OperationMode _TAO_OperationDef_Remote_Proxy_Impl::mode (
-+ CORBA_Object *_collocated_tao_target_,
++void IR_ArrayDef::length (
+ CORBA::ULong length,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
-@@ -25920,364 +16580,129 @@
- ))
- {
-
-- this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).length (
-- this,
-- length,
-- ACE_TRY_ENV
-+ 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",
-+ 9,
-+ 0,
-+ istub->orb_core ()
+@@ -26243,7 +25748,7 @@
);
-+
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
-+ );
-+ ACE_CHECK_RETURN (_tao_retval);
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ 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),
-+ _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
-+ );
-+ }
-+ break;
-+ }
-+
-+ return _tao_retval;
}
-CORBA::TypeCode_ptr IR::ArrayDef::element_type (
-+void _TAO_OperationDef_Remote_Proxy_Impl::mode (
-+ CORBA_Object *_collocated_tao_target_,
-+ IR_OperationMode mode,
++CORBA::TypeCode_ptr IR_ArrayDef::element_type (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
- CORBA::SystemException
- ))
- {
--
-- return this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).element_type (
-- this,
-- ACE_TRY_ENV
-- );
--}
--
+@@ -26260,7 +25765,7 @@
+ );
+ }
+
-IR::IDLType_ptr IR::ArrayDef::element_type_def (
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- return this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).element_type_def (
-- this,
-- ACE_TRY_ENV
-- );
--}
-+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW (CORBA::INTERNAL ());
++IR_IDLType_ptr IR_ArrayDef::element_type_def (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -26277,8 +25782,8 @@
+ );
+ }
-void IR::ArrayDef::element_type_def (
- IR::IDLType_ptr element_type_def,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).element_type_def (
-- this,
-- element_type_def,
-- ACE_TRY_ENV
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_set_mode",
-+ 9,
-+ 1,
-+ istub->orb_core ()
++void IR_ArrayDef::element_type_def (
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -26296,9 +25801,8 @@
);
--}
--
+ }
+
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::TAO_ClientRequestInfo_IR_ArrayDef_length_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::TAO_ClientRequestInfo_IR_ArrayDef_length_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -26307,7 +25811,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -26319,7 +25823,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -26332,7 +25836,7 @@
+
+
+ CORBA::Any *
-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -26348,13 +25852,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const CORBA::ULong & length,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- length_ (length)
--{}
--
--Dynamic::ParameterList *
++IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::TAO_ClientRequestInfo_IR_ArrayDef_length_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const CORBA::ULong & length,
+@@ -26365,7 +25869,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_length = parameter_list->length ();
-- parameter_list->length (length_length + 1);
-- (*parameter_list)[length_length].argument <<= length_;
-- (*parameter_list)[length_length].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -26384,7 +25888,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -26397,7 +25901,7 @@
+
+
+ CORBA::Any *
-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
++IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -26409,7 +25913,7 @@
+ return result_any;
+ }
+
-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -26418,7 +25922,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -26430,7 +25934,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -26443,7 +25947,7 @@
+
+
+ CORBA::Any *
-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -26459,13 +25963,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -26474,7 +25978,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -26486,7 +25990,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -26499,7 +26003,7 @@
+
+
+ CORBA::Any *
-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -26515,16 +26019,16 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- IR::IDLType_ptr element_type_def,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- element_type_def_ (element_type_def)
--{}
--
--Dynamic::ParameterList *
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -26532,7 +26036,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_element_type_def = parameter_list->length ();
-- parameter_list->length (length_element_type_def + 1);
-- (*parameter_list)[length_element_type_def].argument <<= this->element_type_def_;
--
-- (*parameter_list)[length_element_type_def].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -26552,7 +26056,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
++IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -26565,7 +26069,7 @@
--CORBA::Any *
+
+ CORBA::Any *
-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
-+ for (;;)
-+ {
-+ _tao_call.start (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 << mode)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
-+ {
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
-+ }
-+
-+ break;
-+ }
++IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -26578,13 +26082,14 @@
}
--#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
+ #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));
--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
--
--///////////////////////////////////////////////////////////////////////
--// Base & Remote Proxy Implementation.
--//
--
++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)
+@@ -26594,15 +26099,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)
--{}
--
--// Remote Implementation of the IDL interface methods
--
++_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 (
-+IR_ContextIdSeq * _TAO_OperationDef_Remote_Proxy_Impl::contexts (
++CORBA::TypeCode_ptr _TAO_ExceptionDef_Remote_Proxy_Impl::type (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -26286,8 +16711,7 @@
- ))
- {
-
-- CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
-- CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-+ IR_ContextIdSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -26295,312 +16719,124 @@
- 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 (
- istub,
-- "_get_type",
-- 9,
-+ "_get_contexts",
-+ 13,
- 0,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -26640,7 +26145,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ 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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ 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)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -26762,7 +26267,7 @@
return _tao_safe_retval._retn ();
}
-IR::StructMemberSeq * IR::_TAO_ExceptionDef_Remote_Proxy_Impl::members (
-+void _TAO_OperationDef_Remote_Proxy_Impl::contexts (
++IR_StructMemberSeq * _TAO_ExceptionDef_Remote_Proxy_Impl::members (
CORBA_Object *_collocated_tao_target_,
-+ const IR_ContextIdSeq & contexts,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
+@@ -26771,7 +26276,7 @@
))
{
--
+
- 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_THROW (CORBA::INTERNAL ());
+@@ -26779,8 +26284,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",
-- 12,
-- 0,
-+ "_set_contexts",
-+ 13,
-+ 1,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ "_get_members",
+@@ -26801,7 +26306,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -26857,7 +26362,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::StructMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-+ ACE_CHECK;
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << contexts)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
-
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
-+
-+ break;
-+ }
++ IR_StructMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -26923,24 +26428,19 @@
+ return _tao_safe_retval._retn ();
}
-void IR::_TAO_ExceptionDef_Remote_Proxy_Impl::members (
-+IR_ExceptionDefSeq * _TAO_OperationDef_Remote_Proxy_Impl::exceptions (
++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 ((
-@@ -26608,146 +16844,128 @@
+ CORBA::SystemException
))
{
-
+-
-
-+ IR_ExceptionDefSeq *_tao_retval = 0;
-
-
+-
+-
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
-- ACE_THROW (CORBA::INTERNAL ());
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+ ACE_THROW (CORBA::INTERNAL ());
-
-+ ACE_NEW_RETURN (_tao_retval, IR_ExceptionDefSeq, _tao_retval);
-+ IR_ExceptionDefSeq_var _tao_safe_retval (_tao_retval);
+-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
-- "_set_members",
-- 12,
-- 1,
-+ "_get_exceptions",
-+ 15,
-+ 0,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- members,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << members)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ 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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ 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)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-+ 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;
-+ }
-+
-+ return _tao_safe_retval._retn ();
-+}
-+
-+void _TAO_OperationDef_Remote_Proxy_Impl::exceptions (
-+ CORBA_Object *_collocated_tao_target_,
-+ 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",
-+ 15,
-+ 1,
-+ istub->orb_core ()
-+ );
-+
-+ for (;;)
-+ {
-+ _tao_call.start (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_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
-+ ACE_CHECK;
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << exceptions)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
+ "_set_members",
+@@ -26961,7 +26461,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
- }
--
-- break;
-- }
--
-+
-+ break;
-+ }
- }
-
-
-@@ -26760,32 +16978,32 @@
+ #if TAO_HAS_INTERCEPTORS == 1
+- IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set ri (
++ IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ members,
+@@ -27085,37 +26585,37 @@
// Remote & Base Proxy Broker Implementation
//
-IR::_TAO_ExceptionDef_Proxy_Broker::_TAO_ExceptionDef_Proxy_Broker (void)
-+_TAO_OperationDef_Proxy_Broker::_TAO_OperationDef_Proxy_Broker (void)
++_TAO_ExceptionDef_Proxy_Broker::_TAO_ExceptionDef_Proxy_Broker (void)
{
}
-IR::_TAO_ExceptionDef_Proxy_Broker::~_TAO_ExceptionDef_Proxy_Broker (void)
-+_TAO_OperationDef_Proxy_Broker::~_TAO_OperationDef_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_OperationDef_Remote_Proxy_Broker *the_TAO_OperationDef_Remote_Proxy_Broker (void)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_ExceptionDef_Remote_Proxy_Broker *
+-IR::_TAO_ExceptionDef_Remote_Proxy_Broker::the_TAO_ExceptionDef_Remote_Proxy_Broker (void)
++_TAO_ExceptionDef_Remote_Proxy_Broker *
++_TAO_ExceptionDef_Remote_Proxy_Broker::the_TAO_ExceptionDef_Remote_Proxy_Broker (void)
{
- static ::IR::_TAO_ExceptionDef_Remote_Proxy_Broker remote_proxy_broker;
-+ static ::_TAO_OperationDef_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_OperationDef_Remote_Proxy_Broker::_TAO_OperationDef_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_OperationDef_Remote_Proxy_Broker::~_TAO_OperationDef_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_OperationDef_Proxy_Impl&
-+_TAO_OperationDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_OperationDef *object,
++_TAO_ExceptionDef_Proxy_Impl&
++_TAO_ExceptionDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_ExceptionDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -26801,115 +17019,114 @@
+@@ -27131,111 +26631,110 @@
// default constructor
-IR::ExceptionDef::ExceptionDef (int collocated)
-+IR_OperationDef::IR_OperationDef (int collocated)
++IR_ExceptionDef::IR_ExceptionDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_ExceptionDef_setup_collocation (collocated);
}
// destructor
-IR::ExceptionDef::~ExceptionDef (void)
-+IR_OperationDef::~IR_OperationDef (void)
++IR_ExceptionDef::~IR_ExceptionDef (void)
{}
void
--IR::ExceptionDef::_tao_setup_collocation (int collocated)
-+IR_OperationDef::_tao_setup_collocation (int collocated)
+-IR::ExceptionDef::IR_ExceptionDef_setup_collocation (int collocated)
++IR_ExceptionDef::IR_ExceptionDef_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_ExceptionDef_Proxy_Broker_ =
+ this->the_TAO_ExceptionDef_Proxy_Broker_ =
- ::IR__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_OperationDef_Proxy_Broker_ =
-+ _TAO_OperationDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_ExceptionDef_Proxy_Broker_ =
+ this->the_TAO_ExceptionDef_Proxy_Broker_ =
- ::IR::_TAO_ExceptionDef_Remote_Proxy_Broker::the_TAO_ExceptionDef_Remote_Proxy_Broker ();
-+ this->the_TAO_OperationDef_Proxy_Broker_ =
-+ ::the_TAO_OperationDef_Remote_Proxy_Broker ();
-+
-+ IR_Contained::_tao_setup_collocation (collocated);
++ _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);
+ this->IR_Contained_setup_collocation (collocated);
+-
+ this->IR_Container_setup_collocation (collocated);
}
-void IR::ExceptionDef::_tao_any_destructor (void *x)
-+void IR_OperationDef::_tao_any_destructor (void *x)
++void IR_ExceptionDef::_tao_any_destructor (void *x)
{
- ExceptionDef *tmp = ACE_static_cast (ExceptionDef*,x);
-+ IR_OperationDef *tmp = ACE_static_cast (IR_OperationDef*,x);
++ IR_ExceptionDef *tmp = ACE_static_cast (IR_ExceptionDef*,x);
CORBA::release (tmp);
}
-IR::ExceptionDef_ptr IR::ExceptionDef::_narrow (
-+IR_OperationDef_ptr IR_OperationDef::_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_OperationDef::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ExceptionDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (ExceptionDef::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/OperationDef:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_OperationDef::_nil ());
++ ACE_CHECK_RETURN (IR_ExceptionDef::_nil ());
if (is_a == 0)
- return ExceptionDef::_nil ();
-+ return IR_OperationDef::_nil ();
++ return IR_ExceptionDef::_nil ();
}
- return ExceptionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_OperationDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_ExceptionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::ExceptionDef_ptr IR::ExceptionDef::_unchecked_narrow (
-+IR_OperationDef_ptr IR_OperationDef::_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_OperationDef::_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_OperationDef_ptr default_proxy = IR_OperationDef::_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_OperationDef_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_OperationDef (
++ ::IR_ExceptionDef (
stub,
1,
obj->_servant ()),
- ExceptionDef::_nil ());
-+ IR_OperationDef::_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_OperationDef (stub, 0, obj->_servant ()), IR_OperationDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_ExceptionDef (stub, 0, obj->_servant ()), IR_ExceptionDef::_nil ());
return default_proxy;
}
else
@@ -34600,14 +15687,14 @@
ACE_reinterpret_cast
(
- ExceptionDef_ptr,
-+ IR_OperationDef_ptr,
++ IR_ExceptionDef_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &ExceptionDef::_narrow
-+ &IR_OperationDef::_narrow
++ &IR_ExceptionDef::_narrow
)
)
);
@@ -34615,8 +15702,8 @@
-IR::ExceptionDef_ptr
-IR::ExceptionDef::_duplicate (ExceptionDef_ptr obj)
-+IR_OperationDef_ptr
-+IR_OperationDef::_duplicate (IR_OperationDef_ptr obj)
++IR_ExceptionDef_ptr
++IR_ExceptionDef::_duplicate (IR_ExceptionDef_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -34624,52 +15711,48 @@
}
-CORBA::Boolean IR::ExceptionDef::_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)
++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/OperationDef: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
-@@ -26917,46 +17134,34 @@
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ExceptionDef:1.0")) ||
+@@ -27248,46 +26747,46 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::ExceptionDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_OperationDef::_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_OperationDef::_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))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
- &ACE_NESTED_CLASS (::IR, Container)::_narrow))
-+ &IR_Contained::_narrow))
++ &IR_Container::_narrow))
retv = ACE_reinterpret_cast
(
void *,
ACE_static_cast
(
- IR::Container_ptr,
-+ IR_Contained_ptr,
++ IR_Container_ptr,
this
)
);
@@ -34687,701 +15770,382 @@
this
)
);
-@@ -26969,12 +17174,12 @@
+@@ -27300,12 +26799,12 @@
return retv;
}
-const char* IR::ExceptionDef::_interface_repository_id (void) const
-+const char* IR_OperationDef::_interface_repository_id (void) const
++const char* IR_ExceptionDef::_interface_repository_id (void) const
{
-- return "IDL:omg.org/IR/ExceptionDef:1.0";
-+ return "IDL:omg.org/IR/OperationDef:1.0";
+ return "IDL:omg.org/IR/ExceptionDef:1.0";
}
-CORBA::TypeCode_ptr IR::ExceptionDef::type (
-+CORBA::TypeCode_ptr IR_OperationDef::result (
++CORBA::TypeCode_ptr IR_ExceptionDef::type (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -26982,13 +17187,13 @@
- ))
- {
-
-- return this->the_TAO_ExceptionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type (
-+ return this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).result (
- this,
- ACE_TRY_ENV
+@@ -27322,7 +26821,7 @@
);
}
-IR::StructMemberSeq * IR::ExceptionDef::members (
-+IR_IDLType_ptr IR_OperationDef::result_def (
++IR_StructMemberSeq * IR_ExceptionDef::members (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -26996,14 +17201,14 @@
- ))
- {
-
-- return this->the_TAO_ExceptionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
-+ return this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).result_def (
- this,
- ACE_TRY_ENV
+@@ -27339,8 +26838,8 @@
);
}
-void IR::ExceptionDef::members (
- const IR::StructMemberSeq & members,
-+void IR_OperationDef::result_def (
-+ IR_IDLType_ptr result_def,
++void IR_ExceptionDef::members (
++ const IR_StructMemberSeq & members,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -27011,201 +17216,151 @@
- ))
- {
-
-- this->the_TAO_ExceptionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
-+ this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).result_def (
- this,
-- members,
-+ result_def,
- ACE_TRY_ENV
+@@ -27358,9 +26857,8 @@
);
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::TAO_ClientRequestInfo_IR_ExceptionDef_type_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-+IR_ParDescriptionSeq * IR_OperationDef::params (
-+ CORBA::Environment &ACE_TRY_ENV
- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::TAO_ClientRequestInfo_IR_ExceptionDef_type_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -27369,7 +26867,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
--IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return exception_list;
-+ return this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).params (
-+ this,
-+ ACE_TRY_ENV
-+ );
++IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -27381,7 +26879,7 @@
}
--
--CORBA::Any *
+ Dynamic::ExceptionList *
+-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
++IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -27394,7 +26892,7 @@
+
+
+ CORBA::Any *
-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void IR_OperationDef::params (
-+ const IR_ParDescriptionSeq & params,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
-
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -27410,13 +26908,13 @@
+ }
+
+ void
-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::result (CORBA::TypeCode_ptr result)
--{
-- // update the result
-- this->_result = result;
-+ this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).params (
-+ this,
-+ params,
-+ ACE_TRY_ENV
-+ );
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-+IR_OperationMode IR_OperationDef::mode (
-+ CORBA::Environment &ACE_TRY_ENV
- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::TAO_ClientRequestInfo_IR_ExceptionDef_members_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -27425,7 +26923,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return parameter_list;
-+ return this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).mode (
-+ this,
-+ ACE_TRY_ENV
-+ );
++IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -27437,7 +26935,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void IR_OperationDef::mode (
-+ IR_OperationMode mode,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return exception_list;
-+ this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).mode (
-+ this,
-+ mode,
-+ ACE_TRY_ENV
-+ );
- }
++IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -27450,7 +26948,7 @@
--
--CORBA::Any *
+
+ CORBA::Any *
-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR_ContextIdSeq * IR_OperationDef::contexts (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -27466,16 +26964,16 @@
+ }
+
+ void
-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::result (IR::StructMemberSeq * result)
--{
-- // 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::TAO_ClientRequestInfo_IR_ExceptionDef_members_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- const IR::StructMemberSeq & members,
-- CORBA::Environment &
-+void IR_OperationDef::contexts (
-+ const IR_ContextIdSeq & contexts,
-+ CORBA::Environment &ACE_TRY_ENV
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &
)
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- members_ (members)
--{}
--
--Dynamic::ParameterList *
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -27483,7 +26981,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_members = parameter_list->length ();
-- parameter_list->length (length_members + 1);
-- (*parameter_list)[length_members].argument <<= this->members_;
-
-- (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).contexts (
-+ this,
-+ contexts,
-+ ACE_TRY_ENV
-+ );
++IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -27503,7 +27001,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- 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.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return exception_list;
-+ return this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).exceptions (
-+ this,
-+ ACE_TRY_ENV
-+ );
- }
++IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -27516,7 +27014,7 @@
--
--CORBA::Any *
+
+ CORBA::Any *
-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-- 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::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return result_any;
-+ this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).exceptions (
-+ this,
-+ exceptions,
-+ ACE_TRY_ENV
-+ );
++IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -27529,17 +27027,19 @@
}
--#endif /* TAO_HAS_INTERCEPTORS */
--static const CORBA::Long _oc_IR_ExceptionDef[] =
-+static const CORBA::Long _oc_IR_OperationDef[] =
+ #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
+ 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
-+ 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 = IR_OperationDef
++ 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_OperationDef (CORBA::tk_objref, sizeof (_oc_IR_OperationDef), (char *) &_oc_IR_OperationDef, 0, sizeof (IR_OperationDef));
++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_DEFINE (CORBA::TypeCode_ptr, _tc_OperationDef, &_tc_TAO_tc_IR_OperationDef)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionDef, &_tc_TAO_tc_IR_ExceptionDef)
TAO_NAMESPACE_END
--static const CORBA::Long _oc_IR_ExceptionDescription[] =
+
-+static const CORBA::Long _oc_IR_OperationDescription[] =
+ 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 = ExceptionDescription
-- 5, // member count
-+ 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 = OperationDescription
-+ 9, // member count
- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
- CORBA::tk_alias, // typecode kind for typedefs
- 64, // encapsulation length
-@@ -27242,283 +17397,327 @@
- CORBA::tk_string,
- 0U, // string length
-
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ 7, ACE_NTOHL (0x72657375), ACE_NTOHL (0x6c740000), // name = result
+@@ -27586,36 +27086,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));
--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
++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);
-- delete tmp;
--}
-+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-+ CORBA::tk_enum, // typecode kind
-+ 100, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/OperationMode:1.0
-+ 14, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e4d6f64), ACE_NTOHL (0x65000000), // name = OperationMode
-+ 2, // member count
-+ 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
++ IR_ExceptionDescription *tmp = ACE_static_cast (IR_ExceptionDescription*,x);
+ delete tmp;
+ }
-+ 9, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x65787473), ACE_NTOHL (0x0), // name = contexts
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = ContextIdSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 160, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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
-+ 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_string,
-+ 0U, // string length
-
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
+-
+ #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
+-
+ // 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;
-- tmp = _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (length);
--
-- if (this->buffer_ != 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_);
-- for (CORBA::ULong i = 0; i < this->length_; ++i)
-- if (!this->release_)
++ 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]);
-- else
-- tmp[i] = old[i];
--
-- if (this->release_)
-- delete[] old;
--
-- }
-- this->buffer_ = tmp;
-- }
--
-- void
++ tmp[i] = IR_ExceptionDef::_duplicate (old[i]);
+ else
+ tmp[i] = old[i];
+
+@@ -27627,106 +27124,97 @@
+ }
+
+ void
- IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_deallocate_buffer (void)
-- {
-- if (this->buffer_ == 0 || this->release_ == 0)
-- return;
++ _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_);
-- for (CORBA::ULong i = 0; i < this->length_; ++i)
-- {
-- CORBA::release (tmp[i]);
++ 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 ();
-- }
-- _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::freebuf (tmp);
-- this->buffer_ = 0;
-- }
--
++ 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)
-- {
-- this->_deallocate_buffer ();
-- }
--
-- 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_);
--
-- for (CORBA::ULong i = nl; i < ol; ++i)
-- {
-- CORBA::release (tmp[i]);
++ 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
++ tmp[i] = IR_ExceptionDef::_nil ();
+ }
+ }
+ void
- IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_downcast (
-- void* target,
-- CORBA_Object *src,
-- CORBA_Environment &ACE_TRY_ENV
-- )
-- {
++ _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);
-- }
-+ 0U,
++ IR_ExceptionDef **tmp = ACE_static_cast (IR_ExceptionDef**, target);
++ *tmp = IR_ExceptionDef::_narrow (src, ACE_TRY_ENV);
+ }
-- CORBA_Object*
+ 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);
-- return *tmp;
-- }
--
++ IR_ExceptionDef **tmp = ACE_static_cast (IR_ExceptionDef**, src);
+ return *tmp;
+ }
+
-#endif /* end #if !defined */
-
-+ 11, ACE_NTOHL (0x70617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72730000), // name = parameters
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = ParDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 404, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = ParameterDescription
-+ 4, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-+
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-+ 9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0), // name = type_def
-+ CORBA::tk_objref, // typecode kind
-+ 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 = IR_IDLType
-+
-+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-+ CORBA::tk_enum, // typecode kind
-+ 116, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x6172616d), ACE_NTOHL (0x65746572), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ParameterMode:1.0
-+ 14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000), // name = ParameterMode
-+ 3, // member count
-+ 9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0), // name = PARAM_IN
-+ 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
-+
-+
-+ 0U,
-+
-+
-+ 11, ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = exceptions
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = ExcDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 456, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = ExceptionDescription
-+ 5, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-+
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = 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
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-+
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
-+
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-#if !defined (_IR_EXCEPTIONDEFSEQ_CS_)
-#define _IR_EXCEPTIONDEFSEQ_CS_
-+
-+ 0U,
-+
-+
-+};
-+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)
-+{
-+ IR_OperationDescription *tmp = ACE_static_cast (IR_OperationDescription*,x);
-+ delete tmp;
-+}
-
+-
// *************************************************************
-// IR::ExceptionDefSeq
-+// IR_RepositoryIdSeq
++// IR_ExceptionDefSeq
// *************************************************************
-IR::ExceptionDefSeq::ExceptionDefSeq (void)
-+IR_RepositoryIdSeq::IR_RepositoryIdSeq (void)
++IR_ExceptionDefSeq::IR_ExceptionDefSeq (void)
{}
-IR::ExceptionDefSeq::ExceptionDefSeq (CORBA::ULong max) // uses max size
-+IR_RepositoryIdSeq::IR_RepositoryIdSeq (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
-+ TAO_Unbounded_String_Sequence
+ _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Object_Sequence<IR::ExceptionDef,IR::ExceptionDef_var>
-+ TAO_Unbounded_String_Sequence
++ 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_RepositoryIdSeq::IR_RepositoryIdSeq (CORBA::ULong max, CORBA::ULong length, char * *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
-+ TAO_Unbounded_String_Sequence
+ _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Object_Sequence<IR::ExceptionDef,IR::ExceptionDef_var>
-+ TAO_Unbounded_String_Sequence
++ 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_RepositoryIdSeq::IR_RepositoryIdSeq (const IR_RepositoryIdSeq &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
-+ TAO_Unbounded_String_Sequence
+ _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Object_Sequence<IR::ExceptionDef,IR::ExceptionDef_var>
-+ TAO_Unbounded_String_Sequence
++ TAO_Unbounded_Object_Sequence<IR_ExceptionDef,IR_ExceptionDef_var>
#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
-IR::ExceptionDefSeq::~ExceptionDefSeq (void) // dtor
-+IR_RepositoryIdSeq::~IR_RepositoryIdSeq (void) // dtor
++IR_ExceptionDefSeq::~IR_ExceptionDefSeq (void) // dtor
{}
-void IR::ExceptionDefSeq::_tao_any_destructor (void *x)
-+void IR_RepositoryIdSeq::_tao_any_destructor (void *x)
++void IR_ExceptionDefSeq::_tao_any_destructor (void *x)
{
- ExceptionDefSeq *tmp = ACE_static_cast (ExceptionDefSeq*,x);
-+ IR_RepositoryIdSeq *tmp = ACE_static_cast (IR_RepositoryIdSeq*,x);
++ IR_ExceptionDefSeq *tmp = ACE_static_cast (IR_ExceptionDefSeq*,x);
delete tmp;
}
-
-#endif /* end #if !defined */
-
--static const CORBA::Long _oc_IR_ExceptionDefSeq[] =
-+static const CORBA::Long _oc_IR_RepositoryIdSeq[] =
+ 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 = ExceptionDefSeq
-+ 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 = RepositoryIdSeq
- CORBA::tk_sequence, // typecode kind
-- 76, // encapsulation length
-+ 84, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_objref, // typecode kind
-- 60, // encapsulation length
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 68, // encapsulation length
+@@ -27739,12 +27227,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
+ 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
-+ 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 (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_RepositoryIdSeq (CORBA::tk_alias, sizeof (_oc_IR_RepositoryIdSeq), (char *) &_oc_IR_RepositoryIdSeq, 0, sizeof (IR_RepositoryIdSeq));
++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)
-+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RepositoryIdSeq, &_tc_TAO_tc_IR_RepositoryIdSeq)
- TAO_NAMESPACE_END
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionDefSeq, &_tc_TAO_tc_IR_ExceptionDefSeq)
+@@ -27752,18 +27240,15 @@
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
@@ -35390,46 +16154,38 @@
-
void
- IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-+ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_allocate_buffer (CORBA::ULong length)
{
- IR::ExceptionDescription* tmp = 0;
-- tmp = _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (length);
-+ IR_OperationDescription* tmp = 0;
-+ tmp = _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (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_);
-+ IR_OperationDescription *old = ACE_reinterpret_cast (IR_OperationDescription *,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];
-
- if (this->release_)
-- _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::freebuf (old);
-+ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::freebuf (old);
-
- }
- this->buffer_ = tmp;
+@@ -27776,75 +27261,65 @@
}
void
- IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_deallocate_buffer (void)
-+ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_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_OperationDescription *tmp = ACE_reinterpret_cast (IR_OperationDescription *,this->buffer_);
++ IR_ExceptionDescription *tmp = ACE_reinterpret_cast (IR_ExceptionDescription *,this->buffer_);
-- _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::freebuf (tmp);
-+ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::freebuf (tmp);
+ _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_OpDescriptionSeq::~_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (void) // Dtor.
++ _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::~_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (void) // Dtor.
{
this->_deallocate_buffer ();
}
@@ -35445,12386 +16201,4966 @@
-
// *************************************************************
-// IR::ExcDescriptionSeq
-+// IR_OpDescriptionSeq
++// IR_ExcDescriptionSeq
// *************************************************************
-IR::ExcDescriptionSeq::ExcDescriptionSeq (void)
-+IR_OpDescriptionSeq::IR_OpDescriptionSeq (void)
++IR_ExcDescriptionSeq::IR_ExcDescriptionSeq (void)
{}
-IR::ExcDescriptionSeq::ExcDescriptionSeq (CORBA::ULong max) // uses max size
-+IR_OpDescriptionSeq::IR_OpDescriptionSeq (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
-+ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq
+ _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Sequence<IR::ExceptionDescription>
-+ TAO_Unbounded_Sequence<IR_OperationDescription>
++ 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_OpDescriptionSeq::IR_OpDescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR_OperationDescription *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
-+ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq
+ _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Sequence<IR::ExceptionDescription>
-+ TAO_Unbounded_Sequence<IR_OperationDescription>
++ TAO_Unbounded_Sequence<IR_ExceptionDescription>
#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
-IR::ExcDescriptionSeq::ExcDescriptionSeq (const ExcDescriptionSeq &seq) // copy ctor
-+IR_OpDescriptionSeq::IR_OpDescriptionSeq (const IR_OpDescriptionSeq &seq) // copy ctor
++IR_ExcDescriptionSeq::IR_ExcDescriptionSeq (const IR_ExcDescriptionSeq &seq) // copy ctor
:
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-- _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq
-+ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq
+ _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Sequence<IR::ExceptionDescription>
-+ TAO_Unbounded_Sequence<IR_OperationDescription>
++ TAO_Unbounded_Sequence<IR_ExceptionDescription>
#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
-IR::ExcDescriptionSeq::~ExcDescriptionSeq (void) // dtor
-+IR_OpDescriptionSeq::~IR_OpDescriptionSeq (void) // dtor
++IR_ExcDescriptionSeq::~IR_ExcDescriptionSeq (void) // dtor
{}
-void IR::ExcDescriptionSeq::_tao_any_destructor (void *x)
-+void IR_OpDescriptionSeq::_tao_any_destructor (void *x)
++void IR_ExcDescriptionSeq::_tao_any_destructor (void *x)
{
- ExcDescriptionSeq *tmp = ACE_static_cast (ExcDescriptionSeq*,x);
-+ IR_OpDescriptionSeq *tmp = ACE_static_cast (IR_OpDescriptionSeq*,x);
++ IR_ExcDescriptionSeq *tmp = ACE_static_cast (IR_ExcDescriptionSeq*,x);
delete tmp;
}
-
-#endif /* end #if !defined */
-
--static const CORBA::Long _oc_IR_ExcDescriptionSeq[] =
-+static const CORBA::Long _oc_IR_OpDescriptionSeq[] =
+ 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 = ExcDescriptionSeq
-+ 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 = OpDescriptionSeq
- CORBA::tk_sequence, // typecode kind
-- 456, // encapsulation length
-+ 1896, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- CORBA::tk_struct, // typecode kind
-- 440, // encapsulation length
-+ 1880, // 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 = ExceptionDescription
-- 5, // member count
-+ 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 = OperationDescription
-+ 9, // member count
- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
- CORBA::tk_alias, // typecode kind for typedefs
- 64, // encapsulation length
-@@ -27555,11712 +17754,446 @@
- CORBA::tk_string,
- 0U, // string length
-
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ 7, ACE_NTOHL (0x72657375), ACE_NTOHL (0x6c740000), // name = result
- CORBA::tk_TypeCode,
-
-+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-+ CORBA::tk_enum, // typecode kind
-+ 100, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/OperationMode:1.0
-+ 14, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e4d6f64), ACE_NTOHL (0x65000000), // name = OperationMode
-+ 2, // member count
-+ 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
-
-- 0U,
-+ 9, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x65787473), ACE_NTOHL (0x0), // name = contexts
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = ContextIdSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 160, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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
-+ 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_string,
-+ 0U, // string length
+@@ -27902,11 +27377,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));
--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
-- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/AttributeMode:1.0
-- 14, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x654d6f64), ACE_NTOHL (0x65000000), // name = AttributeMode
-- 2, // member count
-- 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_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
+@@ -27916,7 +27392,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));
--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
-
--///////////////////////////////////////////////////////////////////////
--// Base & Remote Proxy Implementation.
--//
-+ 0U,
++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)
+@@ -27926,15 +27402,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)
--{}
-+ 11, ACE_NTOHL (0x70617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72730000), // name = parameters
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = ParDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 404, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = ParameterDescription
-+ 4, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-
--// Remote Implementation of the IDL interface methods
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
-
--CORBA::TypeCode_ptr IR::_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 = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-+ 9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0), // name = type_def
-+ CORBA::tk_objref, // typecode kind
-+ 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 = IR_IDLType
++_TAO_AttributeDef_Remote_Proxy_Impl::_TAO_AttributeDef_Remote_Proxy_Impl (void)
+ {}
--
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_get_type",
-- 9,
-- 0,
-- istub->orb_core ()
-- );
-+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-+ CORBA::tk_enum, // typecode kind
-+ 116, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x6172616d), ACE_NTOHL (0x65746572), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ParameterMode:1.0
-+ 14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000), // name = ParameterMode
-+ 3, // member count
-+ 9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0), // name = PARAM_IN
-+ 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
+ // Remote Implementation of the IDL interface methods
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+-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
+ )
+@@ -27972,7 +27448,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
-+ 0U,
++ IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -28094,7 +27570,7 @@
+ return _tao_safe_retval._retn ();
+ }
-IR::IDLType_ptr IR::_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_AttributeDef_Remote_Proxy_Impl::type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -28103,8 +27579,8 @@
+ ))
+ {
+
- 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",
-- 13,
-- 0,
-- istub->orb_core ()
-- );
-+ 11, ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = exceptions
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = ExcDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 456, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = ExceptionDescription
-+ 5, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = 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
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-+
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
-+
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
-+
-+
-+ 0U,
-+
-+
-+
-+ 0U,
-+
-+};
-+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)
-+TAO_NAMESPACE_END
-+
-+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++ IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
++ IR_IDLType_var _tao_safe_retval (_tao_retval);
-- for (;;)
-+ 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)
- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
-+ IR_AttributeDescription *old = ACE_reinterpret_cast (IR_AttributeDescription *,this->buffer_);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -28132,7 +27608,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
--#if TAO_HAS_INTERCEPTORS == 1
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -28188,7 +27664,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
-+ for (CORBA::ULong i = 0; i < this->length_; ++i)
-+ tmp[i] = old[i];
-
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
-+ if (this->release_)
-+ _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::freebuf (old);
-
-- break;
- }
-- return _tao_safe_retval._retn ();
--}
--
++ IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -28254,24 +27730,19 @@
+ return _tao_safe_retval._retn ();
+ }
+
-void IR::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
-- CORBA_Object *_collocated_tao_target_,
++void _TAO_AttributeDef_Remote_Proxy_Impl::type_def (
+ CORBA_Object *_collocated_tao_target_,
- IR::IDLType_ptr type_def,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
-+ 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 ();
-+ }
-
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW (CORBA::INTERNAL ());
--
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
-
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_set_type_def",
-- 13,
-- 1,
-- istub->orb_core ()
-- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- type_def,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << type_def)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
-
--}
-+// *************************************************************
-+// IR_AttrDescriptionSeq
-+// *************************************************************
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_type_def",
+@@ -28292,7 +27763,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
+- IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set ri (
++ IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ type_def,
+@@ -28406,7 +27877,7 @@
+
+ }
-IR::AttributeMode IR::_TAO_AttributeDef_Remote_Proxy_Impl::mode (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+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 */
-+ (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 */
-+ (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 */
-+ (seq)
-+{}
-+IR_AttrDescriptionSeq::~IR_AttrDescriptionSeq (void) // dtor
-+{}
-+void IR_AttrDescriptionSeq::_tao_any_destructor (void *x)
++IR_AttributeMode _TAO_AttributeDef_Remote_Proxy_Impl::mode (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -28415,7 +27886,7 @@
+ ))
{
--
+
- 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",
-- 9,
-- 0,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ IR_AttributeMode _tao_retval = (IR_AttributeMode)0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -28443,7 +27914,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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)
-- ))
-- {
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-- _tao_retval
-- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -28499,7 +27970,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::AttributeMode _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_retval;
-+ IR_AttrDescriptionSeq *tmp = ACE_static_cast (IR_AttrDescriptionSeq*,x);
-+ delete tmp;
++ IR_AttributeMode _tao_retval_info = _tao_retval;
+ ri.result (_tao_retval_info);
+ );
+
+@@ -28564,24 +28035,19 @@
+ return _tao_retval;
}
-void IR::_TAO_AttributeDef_Remote_Proxy_Impl::mode (
-- CORBA_Object *_collocated_tao_target_,
++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
-- ))
-+static const CORBA::Long _oc_IR_AttrDescriptionSeq[] =
++ 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",
-- 9,
-- 1,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_mode",
+@@ -28602,7 +28068,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- mode,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << mode)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
--}
-+ 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 = AttrDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 1708, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = AttributeDescription
-+ 8, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
--//
--// End Base & Remote Proxy Implemeentation.
--///////////////////////////////////////////////////////////////////////
-+ 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
-
--///////////////////////////////////////////////////////////////////////
--// Remote & Base Proxy Broker Implementation
--//
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
++ IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ mode,
+@@ -28726,37 +28192,37 @@
+ // Remote & Base Proxy Broker Implementation
+ //
-IR::_TAO_AttributeDef_Proxy_Broker::_TAO_AttributeDef_Proxy_Broker (void)
--{
--}
-+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-+ CORBA::tk_enum, // typecode kind
-+ 104, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/AttributeMode:1.0
-+ 14, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x654d6f64), ACE_NTOHL (0x65000000), // name = AttributeMode
-+ 2, // member count
-+ 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
++_TAO_AttributeDef_Proxy_Broker::_TAO_AttributeDef_Proxy_Broker (void)
+ {
+ }
-IR::_TAO_AttributeDef_Proxy_Broker::~_TAO_AttributeDef_Proxy_Broker (void)
--{
--}
-+ 15, ACE_NTOHL (0x6765745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = get_exceptions
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = ExcDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 456, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = ExceptionDescription
-+ 5, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-
--// Factory Member function Implementation.
--IR::_TAO_AttributeDef_Remote_Proxy_Broker *IR::_TAO_AttributeDef_Remote_Proxy_Broker::the_TAO_AttributeDef_Remote_Proxy_Broker (void)
--{
++_TAO_AttributeDef_Proxy_Broker::~_TAO_AttributeDef_Proxy_Broker (void)
+ {
+ }
+
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_AttributeDef_Remote_Proxy_Broker *
+-IR::_TAO_AttributeDef_Remote_Proxy_Broker::the_TAO_AttributeDef_Remote_Proxy_Broker (void)
++_TAO_AttributeDef_Remote_Proxy_Broker *
++_TAO_AttributeDef_Remote_Proxy_Broker::the_TAO_AttributeDef_Remote_Proxy_Broker (void)
+ {
- static ::IR::_TAO_AttributeDef_Remote_Proxy_Broker remote_proxy_broker;
-- return &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,
-- 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
++_TAO_AttributeDef_Proxy_Impl&
++_TAO_AttributeDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_AttributeDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -28772,109 +28238,109 @@
+
+
+ // default constructor
-IR::AttributeDef::AttributeDef (int collocated)
--{
-- this->_tao_setup_collocation (collocated);
--}
--
--// destructor
++IR_AttributeDef::IR_AttributeDef (int collocated)
+ {
+ this->IR_AttributeDef_setup_collocation (collocated);
+ }
+
+ // destructor
-IR::AttributeDef::~AttributeDef (void)
--{}
--
--void
--IR::AttributeDef::_tao_setup_collocation (int collocated)
--{
-- if (collocated)
-- this->the_TAO_AttributeDef_Proxy_Broker_ =
++IR_AttributeDef::~IR_AttributeDef (void)
+ {}
+
+ void
+-IR::AttributeDef::IR_AttributeDef_setup_collocation (int collocated)
++IR_AttributeDef::IR_AttributeDef_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_AttributeDef_Proxy_Broker_ =
- ::IR__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer (this);
-- else
-- this->the_TAO_AttributeDef_Proxy_Broker_ =
++ _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 ();
--
-- ACE_NESTED_CLASS (IR, Contained)::_tao_setup_collocation (collocated);
--}
--
++ _TAO_AttributeDef_Remote_Proxy_Broker::the_TAO_AttributeDef_Remote_Proxy_Broker ();
+
+ this->IR_Contained_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);
-- CORBA::release (tmp);
--}
--
++ 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))
++IR_AttributeDef_ptr IR_AttributeDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
- return AttributeDef::_nil ();
-- if (! obj->_is_local ())
-- {
-- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/AttributeDef:1.0", ACE_TRY_ENV);
++ 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 ());
-- if (is_a == 0)
++ 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 (
-- CORBA::Object_ptr obj,
-- CORBA::Environment &
-- )
--{
-- if (CORBA::is_nil (obj))
++IR_AttributeDef_ptr IR_AttributeDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
- return AttributeDef::_nil ();
-- if (! obj->_is_local ())
-- {
-- TAO_Stub* stub = obj->_stubobj ();
-- if (stub)
-- stub->_incr_refcnt ();
++ return IR_AttributeDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
- AttributeDef_ptr default_proxy = AttributeDef::_nil ();
--
-- if (
-- !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-- stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
++ 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
-- )
-- {
-- ACE_NEW_RETURN (
-- default_proxy,
++ obj->_is_collocated () &&_TAO_AttributeDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
- ::IR::AttributeDef (
-- stub,
-- 1,
-- obj->_servant ()),
--
++ ::IR_AttributeDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
- AttributeDef::_nil ());
-- }
-- if (CORBA::is_nil (default_proxy))
++ IR_AttributeDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, ::IR::AttributeDef (stub, 0, obj->_servant ()), AttributeDef::_nil ());
-- return default_proxy;
-- }
-- else
-- return
-- ACE_reinterpret_cast
-- (
++ ACE_NEW_RETURN (default_proxy, ::IR_AttributeDef (stub, 0, obj->_servant ()), IR_AttributeDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
- AttributeDef_ptr,
-- obj->_tao_QueryInterface
-- (
-- ACE_reinterpret_cast
-- (
-- ptr_arith_t,
++ 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)
--{
-- if (!CORBA::is_nil (obj))
-- obj->_add_ref ();
-- return 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)
--{
-- 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);
--}
--
++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")) ||
+@@ -28886,34 +28352,34 @@
+ 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,
++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))
-- retv = ACE_reinterpret_cast (void*, this);
-- else 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,
- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_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::_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;
--}
--
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -28926,12 +28392,12 @@
+ return retv;
+ }
+
-const char* IR::AttributeDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/AttributeDef:1.0";
--}
--
++const char* IR_AttributeDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/AttributeDef:1.0";
+ }
+
-CORBA::TypeCode_ptr IR::AttributeDef::type (
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- return this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type (
-- this,
-- ACE_TRY_ENV
-- );
--}
--
++CORBA::TypeCode_ptr IR_AttributeDef::type (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -28948,7 +28414,7 @@
+ );
+ }
+
-IR::IDLType_ptr IR::AttributeDef::type_def (
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- return this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type_def (
-- this,
-- ACE_TRY_ENV
-- );
--}
--
++IR_IDLType_ptr IR_AttributeDef::type_def (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -28965,8 +28431,8 @@
+ );
+ }
+
-void IR::AttributeDef::type_def (
- IR::IDLType_ptr type_def,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type_def (
-- this,
-- type_def,
-- ACE_TRY_ENV
-- );
--}
--
++void IR_AttributeDef::type_def (
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -28984,7 +28450,7 @@
+ );
+ }
+
-IR::AttributeMode IR::AttributeDef::mode (
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- return this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).mode (
-- this,
-- ACE_TRY_ENV
-- );
--}
--
++IR_AttributeMode IR_AttributeDef::mode (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -28993,7 +28459,7 @@
+ {
+ _TAO_AttributeDef_Proxy_Impl &proxy =
+ this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+- ACE_CHECK_RETURN ((IR::AttributeMode)0);
++ ACE_CHECK_RETURN ((IR_AttributeMode)0);
+
+ return proxy.mode (
+ this,
+@@ -29001,8 +28467,8 @@
+ );
+ }
+
-void IR::AttributeDef::mode (
- IR::AttributeMode mode,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).mode (
-- this,
-- mode,
-- ACE_TRY_ENV
-- );
--}
--
++void IR_AttributeDef::mode (
++ IR_AttributeMode mode,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -29020,9 +28486,8 @@
+ );
+ }
+
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::TAO_ClientRequestInfo_IR_AttributeDef_type_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::TAO_ClientRequestInfo_IR_AttributeDef_type_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -29031,7 +28496,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -29043,7 +28508,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -29056,7 +28521,7 @@
+
+
+ CORBA::Any *
-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -29072,13 +28537,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -29087,7 +28552,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -29099,7 +28564,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -29112,7 +28577,7 @@
+
+
+ CORBA::Any *
-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -29128,16 +28593,16 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- IR::IDLType_ptr type_def,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- type_def_ (type_def)
--{}
--
--Dynamic::ParameterList *
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -29145,7 +28610,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_type_def = parameter_list->length ();
-- parameter_list->length (length_type_def + 1);
-- (*parameter_list)[length_type_def].argument <<= this->type_def_;
--
-- (*parameter_list)[length_type_def].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -29165,7 +28630,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -29178,7 +28643,7 @@
+
+
+ CORBA::Any *
-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
++IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -29190,7 +28655,7 @@
+ return result_any;
+ }
+
-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::TAO_ClientRequestInfo_IR_AttributeDef_mode_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::TAO_ClientRequestInfo_IR_AttributeDef_mode_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -29199,7 +28664,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -29211,7 +28676,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -29224,7 +28689,7 @@
+
+
+ CORBA::Any *
-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -29240,16 +28705,16 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::TAO_ClientRequestInfo_IR_AttributeDef_mode_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- IR::AttributeMode & mode,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- mode_ (mode)
--{}
--
--Dynamic::ParameterList *
++ IR_AttributeMode & mode,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -29257,7 +28722,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_mode = parameter_list->length ();
-- parameter_list->length (length_mode + 1);
-- (*parameter_list)[length_mode].argument <<= this->mode_;
--
-- (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -29277,7 +28742,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -29290,7 +28755,7 @@
+
+
+ CORBA::Any *
-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--#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
++IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -29303,17 +28768,19 @@
+ }
+
+ #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));
--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 = AttributeDescription
-- 8, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
--
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
--
-- 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-- CORBA::tk_enum, // typecode kind
-- 104, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/AttributeMode:1.0
-- 14, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x654d6f64), ACE_NTOHL (0x65000000), // name = AttributeMode
-- 2, // member count
-- 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
--
-- 15, ACE_NTOHL (0x6765745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = get_exceptions
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = ExcDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 456, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = ExceptionDescription
-- 5, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
--
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
--
--
-- 0U,
--
--
-- 15, ACE_NTOHL (0x7075745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = put_exceptions
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = ExcDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 456, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = ExceptionDescription
-- 5, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
--
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
--
--
-- 0U,
--
--
--};
++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
+@@ -29486,14 +28953,15 @@
+
+
+ };
-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
++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);
-- delete tmp;
--}
--
--static const CORBA::Long _oc_IR_OperationMode[] =
--{
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/OperationMode:1.0
-- 14, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e4d6f64), ACE_NTOHL (0x65000000), // name = OperationMode
-- 2, // member count
-- 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
--};
++ IR_AttributeDescription *tmp = ACE_static_cast (IR_AttributeDescription*,x);
+ delete tmp;
+ }
+
+@@ -29506,11 +28974,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));
--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
-- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x6172616d), ACE_NTOHL (0x65746572), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ParameterMode:1.0
-- 14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000), // name = ParameterMode
-- 3, // member count
-- 9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0), // name = PARAM_IN
-- 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_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
+@@ -29521,11 +28990,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));
--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 = ParameterDescription
-- 4, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
--
-- 9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0), // name = type_def
-- CORBA::tk_objref, // typecode kind
-- 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
++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
+@@ -29549,7 +29019,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
--
-- 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-- CORBA::tk_enum, // typecode kind
-- 116, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x6172616d), ACE_NTOHL (0x65746572), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ParameterMode:1.0
-- 14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000), // name = ParameterMode
-- 3, // member count
-- 9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0), // name = PARAM_IN
-- 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
--
--};
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
+ CORBA::tk_enum, // typecode kind
+@@ -29563,32 +29033,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));
--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
++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);
-- delete tmp;
--}
--
--
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
++ IR_ParameterDescription *tmp = ACE_static_cast (IR_ParameterDescription*,x);
+ delete tmp;
+ }
+
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CS_
-
-- void
+ 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;
-- tmp = _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (length);
--
-- if (this->buffer_ != 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_);
--
-- 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
++ IR_ParameterDescription *old = ACE_reinterpret_cast (IR_ParameterDescription *,this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp[i] = old[i];
+@@ -29601,75 +29069,65 @@
+ }
+
+ void
- IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_deallocate_buffer (void)
-- {
-- if (this->buffer_ == 0 || this->release_ == 0)
-- return;
--
++ _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;
-- }
--
++ 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.
-- {
-- this->_deallocate_buffer ();
-- }
--
++ _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::~_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (void) // Dtor.
+ {
+ this->_deallocate_buffer ();
+ }
+
-
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
--
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_PARDESCRIPTIONSEQ_CS_)
-#define _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
-- :
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-- _TAO_Unbounded_Sequence_IR_ParDescriptionSeq
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
++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 */
-- (max)
--{}
++ 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)
-- :
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-- _TAO_Unbounded_Sequence_IR_ParDescriptionSeq
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
++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 */
-- (max, length, buffer, release)
--{}
++ TAO_Unbounded_Sequence<IR_ParameterDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
-IR::ParDescriptionSeq::ParDescriptionSeq (const ParDescriptionSeq &seq) // copy ctor
-- :
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-- _TAO_Unbounded_Sequence_IR_ParDescriptionSeq
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
++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 */
-- (seq)
--{}
++ 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);
-- delete tmp;
--}
--
++ 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
-- 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 = ParDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 404, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = ParameterDescription
-- 4, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
--
-- 9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0), // name = type_def
-- CORBA::tk_objref, // typecode kind
-- 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
+ static const CORBA::Long _oc_IR_ParDescriptionSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -29701,7 +29159,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
--
-- 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-- CORBA::tk_enum, // typecode kind
-- 116, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x6172616d), ACE_NTOHL (0x65746572), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ParameterMode:1.0
-- 14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000), // name = ParameterMode
-- 3, // member count
-- 9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0), // name = PARAM_IN
-- 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
--
--
-- 0U,
--
--};
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
+ CORBA::tk_enum, // typecode kind
+@@ -29718,11 +29176,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));
--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
-- 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_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));
--TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
--TAO_NAMESPACE_BEGIN (IR)
--TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ContextIdentifier, &_tc_TAO_tc_IR_ContextIdentifier)
--TAO_NAMESPACE_END
--
++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
+@@ -29743,16 +29202,13 @@
+ 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
--// *************************************************************
--
++// IR_ContextIdSeq
+ // *************************************************************
+
-IR::ContextIdSeq::ContextIdSeq (void)
--{}
++IR_ContextIdSeq::IR_ContextIdSeq (void)
+ {}
-IR::ContextIdSeq::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 */
-- (max)
--{}
++IR_ContextIdSeq::IR_ContextIdSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ TAO_Unbounded_String_Sequence
+@@ -29761,7 +29217,7 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
-IR::ContextIdSeq::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 */
-- (max, length, buffer, 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
+@@ -29770,7 +29226,7 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
-IR::ContextIdSeq::ContextIdSeq (const 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 */
-- (seq)
--{}
++IR_ContextIdSeq::IR_ContextIdSeq (const IR_ContextIdSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ TAO_Unbounded_String_Sequence
+@@ -29779,17 +29235,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);
-- delete tmp;
--}
--
++ 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
-- 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 = ContextIdSeq
-- CORBA::tk_sequence, // typecode kind
-- 160, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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
-- 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_string,
-- 0U, // string length
--
--
-- 0U,
--
--};
+ static const CORBA::Long _oc_IR_ContextIdSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -29815,7 +29268,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));
--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
--
--///////////////////////////////////////////////////////////////////////
--// Base & Remote Proxy Implementation.
--//
--
++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)
+@@ -29825,15 +29278,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)
--{}
--
--// Remote Implementation of the IDL interface methods
--
++_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_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_result",
-- 11,
-- 0,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++CORBA::TypeCode_ptr _TAO_OperationDef_Remote_Proxy_Impl::result (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -29871,7 +29324,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
--
++ IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -29993,7 +29446,7 @@
+ return _tao_safe_retval._retn ();
+ }
+
-IR::IDLType_ptr IR::_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_OperationDef_Remote_Proxy_Impl::result_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -30002,8 +29455,8 @@
+ ))
+ {
+
- 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_result_def",
-- 15,
-- 0,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
++ IR_IDLType_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -30031,7 +29484,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -30087,7 +29540,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
--
++ IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -30153,24 +29606,19 @@
+ return _tao_safe_retval._retn ();
+ }
+
-void IR::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
-- CORBA_Object *_collocated_tao_target_,
++void _TAO_OperationDef_Remote_Proxy_Impl::result_def (
+ CORBA_Object *_collocated_tao_target_,
- IR::IDLType_ptr result_def,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
--
--
++ 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",
-- 15,
-- 1,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-
--#endif /* TAO_HAS_INTERCEPTORS */
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_result_def",
+@@ -30191,7 +29639,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- result_def,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << result_def)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
--}
--
++ IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ result_def,
+@@ -30305,7 +29753,7 @@
+
+ }
+
-IR::ParDescriptionSeq * IR::_TAO_OperationDef_Remote_Proxy_Impl::params (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
++IR_ParDescriptionSeq * _TAO_OperationDef_Remote_Proxy_Impl::params (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -30314,7 +29762,7 @@
+ ))
+ {
+
- IR::ParDescriptionSeq *_tao_retval = 0;
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
--
--
++ IR_ParDescriptionSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -30322,8 +29770,8 @@
+ 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 (
-- istub,
-- "_get_params",
-- 11,
-- 0,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ 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",
+@@ -30344,7 +29792,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -30400,7 +29848,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::ParDescriptionSeq * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
--
++ IR_ParDescriptionSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -30466,24 +29914,19 @@
+ return _tao_safe_retval._retn ();
+ }
+
-void IR::_TAO_OperationDef_Remote_Proxy_Impl::params (
-- CORBA_Object *_collocated_tao_target_,
++void _TAO_OperationDef_Remote_Proxy_Impl::params (
+ CORBA_Object *_collocated_tao_target_,
- const IR::ParDescriptionSeq & params,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
--
--
++ 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",
-- 11,
-- 1,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-
--#endif /* TAO_HAS_INTERCEPTORS */
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_params",
+@@ -30504,7 +29947,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- params,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << params)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
--}
--
++ IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ params,
+@@ -30618,7 +30061,7 @@
+
+ }
+
-IR::OperationMode IR::_TAO_OperationDef_Remote_Proxy_Impl::mode (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
++IR_OperationMode _TAO_OperationDef_Remote_Proxy_Impl::mode (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -30627,7 +30070,7 @@
+ ))
+ {
+
- 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",
-- 9,
-- 0,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ IR_OperationMode _tao_retval = (IR_OperationMode)0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -30655,7 +30098,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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)
-- ))
-- {
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-- _tao_retval
-- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -30711,7 +30154,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::OperationMode _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_retval;
--}
--
++ IR_OperationMode _tao_retval_info = _tao_retval;
+ ri.result (_tao_retval_info);
+ );
+
+@@ -30776,24 +30219,19 @@
+ return _tao_retval;
+ }
+
-void IR::_TAO_OperationDef_Remote_Proxy_Impl::mode (
-- CORBA_Object *_collocated_tao_target_,
++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
-- ))
--{
--
--
--
++ 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",
-- 9,
-- 1,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-
--#endif /* TAO_HAS_INTERCEPTORS */
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_mode",
+@@ -30814,7 +30252,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- mode,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << mode)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
--}
--
++ IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ mode,
+@@ -30928,7 +30366,7 @@
+
+ }
+
-IR::ContextIdSeq * IR::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
++IR_ContextIdSeq * _TAO_OperationDef_Remote_Proxy_Impl::contexts (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -30937,7 +30375,7 @@
+ ))
+ {
+
- IR::ContextIdSeq *_tao_retval = 0;
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
--
--
++ IR_ContextIdSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -30945,8 +30383,8 @@
+ 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 (
-- istub,
-- "_get_contexts",
-- 13,
-- 0,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ 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",
+@@ -30967,7 +30405,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -31023,7 +30461,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::ContextIdSeq * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
--
++ IR_ContextIdSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -31089,24 +30527,19 @@
+ return _tao_safe_retval._retn ();
+ }
+
-void IR::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
-- CORBA_Object *_collocated_tao_target_,
++void _TAO_OperationDef_Remote_Proxy_Impl::contexts (
+ CORBA_Object *_collocated_tao_target_,
- const IR::ContextIdSeq & contexts,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
--
--
++ 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",
-- 13,
-- 1,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-
--#endif /* TAO_HAS_INTERCEPTORS */
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_contexts",
+@@ -31127,7 +30560,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- contexts,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << contexts)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
--}
--
++ IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ contexts,
+@@ -31241,7 +30674,7 @@
+
+ }
+
-IR::ExceptionDefSeq * IR::_TAO_OperationDef_Remote_Proxy_Impl::exceptions (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
++IR_ExceptionDefSeq * _TAO_OperationDef_Remote_Proxy_Impl::exceptions (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -31250,7 +30683,7 @@
+ ))
+ {
+
- IR::ExceptionDefSeq *_tao_retval = 0;
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
--
--
++ IR_ExceptionDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -31258,8 +30691,8 @@
+ 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 (
-- istub,
-- "_get_exceptions",
-- 15,
-- 0,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ 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",
+@@ -31280,7 +30713,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -31336,7 +30769,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::ExceptionDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
--
++ IR_ExceptionDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -31402,24 +30835,19 @@
+ return _tao_safe_retval._retn ();
+ }
+
-void IR::_TAO_OperationDef_Remote_Proxy_Impl::exceptions (
-- CORBA_Object *_collocated_tao_target_,
++void _TAO_OperationDef_Remote_Proxy_Impl::exceptions (
+ CORBA_Object *_collocated_tao_target_,
- const IR::ExceptionDefSeq & exceptions,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
--
--
++ 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",
-- 15,
-- 1,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-
--#endif /* TAO_HAS_INTERCEPTORS */
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_exceptions",
+@@ -31440,7 +30868,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- exceptions,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << exceptions)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
--}
--
--
--//
--// End Base & Remote Proxy Implemeentation.
--///////////////////////////////////////////////////////////////////////
--
--
--///////////////////////////////////////////////////////////////////////
--// Remote & Base Proxy Broker Implementation
--//
--
++ IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ exceptions,
+@@ -31564,37 +30992,37 @@
+ // 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)
--{
--}
--
--// Factory Member function Implementation.
--IR::_TAO_OperationDef_Remote_Proxy_Broker *IR::_TAO_OperationDef_Remote_Proxy_Broker::the_TAO_OperationDef_Remote_Proxy_Broker (void)
--{
++_TAO_OperationDef_Proxy_Broker::~_TAO_OperationDef_Proxy_Broker (void)
+ {
+ }
+
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_OperationDef_Remote_Proxy_Broker *
+-IR::_TAO_OperationDef_Remote_Proxy_Broker::the_TAO_OperationDef_Remote_Proxy_Broker (void)
++_TAO_OperationDef_Remote_Proxy_Broker *
++_TAO_OperationDef_Remote_Proxy_Broker::the_TAO_OperationDef_Remote_Proxy_Broker (void)
+ {
- static ::IR::_TAO_OperationDef_Remote_Proxy_Broker remote_proxy_broker;
-- return &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,
-- 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
++_TAO_OperationDef_Proxy_Impl&
++_TAO_OperationDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_OperationDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -31610,109 +31038,109 @@
+
+
+ // default constructor
-IR::OperationDef::OperationDef (int collocated)
--{
-- this->_tao_setup_collocation (collocated);
--}
--
--// destructor
++IR_OperationDef::IR_OperationDef (int collocated)
+ {
+ this->IR_OperationDef_setup_collocation (collocated);
+ }
+
+ // destructor
-IR::OperationDef::~OperationDef (void)
--{}
--
--void
--IR::OperationDef::_tao_setup_collocation (int collocated)
--{
-- if (collocated)
-- this->the_TAO_OperationDef_Proxy_Broker_ =
++IR_OperationDef::~IR_OperationDef (void)
+ {}
+
+ void
+-IR::OperationDef::IR_OperationDef_setup_collocation (int collocated)
++IR_OperationDef::IR_OperationDef_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_OperationDef_Proxy_Broker_ =
- ::IR__TAO_OperationDef_Proxy_Broker_Factory_function_pointer (this);
-- else
-- this->the_TAO_OperationDef_Proxy_Broker_ =
++ _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 ();
--
-- ACE_NESTED_CLASS (IR, Contained)::_tao_setup_collocation (collocated);
--}
--
++ _TAO_OperationDef_Remote_Proxy_Broker::the_TAO_OperationDef_Remote_Proxy_Broker ();
+
+ this->IR_Contained_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);
-- CORBA::release (tmp);
--}
--
++ 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))
++IR_OperationDef_ptr IR_OperationDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
- return OperationDef::_nil ();
-- if (! obj->_is_local ())
-- {
-- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/OperationDef:1.0", ACE_TRY_ENV);
++ 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 ());
-- if (is_a == 0)
++ 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 (
-- CORBA::Object_ptr obj,
-- CORBA::Environment &
-- )
--{
-- if (CORBA::is_nil (obj))
++IR_OperationDef_ptr IR_OperationDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
- return OperationDef::_nil ();
-- if (! obj->_is_local ())
-- {
-- TAO_Stub* stub = obj->_stubobj ();
-- if (stub)
-- stub->_incr_refcnt ();
++ return IR_OperationDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
- OperationDef_ptr default_proxy = OperationDef::_nil ();
--
-- if (
-- !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-- stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
++ 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
-- )
-- {
-- ACE_NEW_RETURN (
-- default_proxy,
++ obj->_is_collocated () &&_TAO_OperationDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
- ::IR::OperationDef (
-- stub,
-- 1,
-- obj->_servant ()),
--
++ ::IR_OperationDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
- OperationDef::_nil ());
-- }
-- if (CORBA::is_nil (default_proxy))
++ IR_OperationDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, ::IR::OperationDef (stub, 0, obj->_servant ()), OperationDef::_nil ());
-- return default_proxy;
-- }
-- else
-- return
-- ACE_reinterpret_cast
-- (
++ ACE_NEW_RETURN (default_proxy, ::IR_OperationDef (stub, 0, obj->_servant ()), IR_OperationDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
- OperationDef_ptr,
-- obj->_tao_QueryInterface
-- (
-- ACE_reinterpret_cast
-- (
-- ptr_arith_t,
++ 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)
--{
-- if (!CORBA::is_nil (obj))
-- obj->_add_ref ();
-- return 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)
--{
-- 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);
--}
--
++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")) ||
+@@ -31724,34 +31152,34 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
-void *IR::OperationDef::_tao_QueryInterface (ptr_arith_t type)
--{
-- void *retv = 0;
-- if (type == ACE_reinterpret_cast
-- (ptr_arith_t,
++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))
-- retv = ACE_reinterpret_cast (void*, this);
-- else 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,
- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_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::_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;
--}
--
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -31764,12 +31192,12 @@
+ return retv;
+ }
+
-const char* IR::OperationDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/OperationDef:1.0";
--}
--
++const char* IR_OperationDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/OperationDef:1.0";
+ }
+
-CORBA::TypeCode_ptr IR::OperationDef::result (
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- return this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).result (
-- this,
-- ACE_TRY_ENV
-- );
--}
--
++CORBA::TypeCode_ptr IR_OperationDef::result (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -31786,7 +31214,7 @@
+ );
+ }
+
-IR::IDLType_ptr IR::OperationDef::result_def (
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- return this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).result_def (
-- this,
-- ACE_TRY_ENV
-- );
--}
--
++IR_IDLType_ptr IR_OperationDef::result_def (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -31803,8 +31231,8 @@
+ );
+ }
+
-void IR::OperationDef::result_def (
- IR::IDLType_ptr result_def,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).result_def (
-- this,
-- result_def,
-- ACE_TRY_ENV
-- );
--}
--
++void IR_OperationDef::result_def (
++ IR_IDLType_ptr result_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -31822,7 +31250,7 @@
+ );
+ }
+
-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
-- );
--}
--
++IR_ParDescriptionSeq * IR_OperationDef::params (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -31839,8 +31267,8 @@
+ );
+ }
+
-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
-- );
--}
--
++void IR_OperationDef::params (
++ const IR_ParDescriptionSeq & params,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -31858,7 +31286,7 @@
+ );
+ }
+
-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
-- );
--}
--
++IR_OperationMode IR_OperationDef::mode (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -31867,7 +31295,7 @@
+ {
+ _TAO_OperationDef_Proxy_Impl &proxy =
+ this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+- ACE_CHECK_RETURN ((IR::OperationMode)0);
++ ACE_CHECK_RETURN ((IR_OperationMode)0);
+
+ return proxy.mode (
+ this,
+@@ -31875,8 +31303,8 @@
+ );
+ }
+
-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
-- );
--}
--
++void IR_OperationDef::mode (
++ IR_OperationMode mode,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -31894,7 +31322,7 @@
+ );
+ }
+
-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
-- );
--}
--
++IR_ContextIdSeq * IR_OperationDef::contexts (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -31911,8 +31339,8 @@
+ );
+ }
+
-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
-- );
--}
--
++void IR_OperationDef::contexts (
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -31930,7 +31358,7 @@
+ );
+ }
+
-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
-- );
--}
--
++IR_ExceptionDefSeq * IR_OperationDef::exceptions (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -31947,8 +31375,8 @@
+ );
+ }
+
-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
-- );
--}
--
++void IR_OperationDef::exceptions (
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -31966,9 +31394,8 @@
+ );
+ }
+
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::TAO_ClientRequestInfo_IR_OperationDef_result_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::TAO_ClientRequestInfo_IR_OperationDef_result_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -31977,7 +31404,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -31989,7 +31416,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -32002,7 +31429,7 @@
+
+
+ CORBA::Any *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -32018,13 +31445,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::TAO_ClientRequestInfo_IR_OperationDef_result_def_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -32033,7 +31460,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -32045,7 +31472,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -32058,7 +31485,7 @@
+
+
+ CORBA::Any *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -32074,16 +31501,16 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::TAO_ClientRequestInfo_IR_OperationDef_result_def_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- IR::IDLType_ptr result_def,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- result_def_ (result_def)
--{}
--
--Dynamic::ParameterList *
++ IR_IDLType_ptr result_def,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -32091,7 +31518,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_result_def = parameter_list->length ();
-- parameter_list->length (length_result_def + 1);
-- (*parameter_list)[length_result_def].argument <<= this->result_def_;
--
-- (*parameter_list)[length_result_def].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -32111,7 +31538,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -32124,7 +31551,7 @@
+
+
+ CORBA::Any *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -32136,7 +31563,7 @@
+ return result_any;
+ }
+
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::TAO_ClientRequestInfo_IR_OperationDef_params_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::TAO_ClientRequestInfo_IR_OperationDef_params_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -32145,7 +31572,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -32157,7 +31584,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -32170,7 +31597,7 @@
+
+
+ CORBA::Any *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -32186,16 +31613,16 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::TAO_ClientRequestInfo_IR_OperationDef_params_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- const IR::ParDescriptionSeq & params,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- params_ (params)
--{}
--
--Dynamic::ParameterList *
++ const IR_ParDescriptionSeq & params,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -32203,7 +31630,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_params = parameter_list->length ();
-- parameter_list->length (length_params + 1);
-- (*parameter_list)[length_params].argument <<= this->params_;
--
-- (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -32223,7 +31650,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -32236,7 +31663,7 @@
+
+
+ CORBA::Any *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -32248,7 +31675,7 @@
+ return result_any;
+ }
+
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::TAO_ClientRequestInfo_IR_OperationDef_mode_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::TAO_ClientRequestInfo_IR_OperationDef_mode_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -32257,7 +31684,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -32269,7 +31696,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -32282,7 +31709,7 @@
+
+
+ CORBA::Any *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -32298,16 +31725,16 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::TAO_ClientRequestInfo_IR_OperationDef_mode_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- IR::OperationMode & mode,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- mode_ (mode)
--{}
--
--Dynamic::ParameterList *
++ IR_OperationMode & mode,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -32315,7 +31742,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_mode = parameter_list->length ();
-- parameter_list->length (length_mode + 1);
-- (*parameter_list)[length_mode].argument <<= this->mode_;
--
-- (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -32335,7 +31762,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -32348,7 +31775,7 @@
+
+
+ CORBA::Any *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -32360,7 +31787,7 @@
+ return result_any;
+ }
+
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::TAO_ClientRequestInfo_IR_OperationDef_contexts_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::TAO_ClientRequestInfo_IR_OperationDef_contexts_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -32369,7 +31796,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -32381,7 +31808,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -32394,7 +31821,7 @@
+
+
+ CORBA::Any *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -32410,16 +31837,16 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::TAO_ClientRequestInfo_IR_OperationDef_contexts_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- const IR::ContextIdSeq & contexts,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- contexts_ (contexts)
--{}
--
--Dynamic::ParameterList *
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -32427,7 +31854,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_contexts = parameter_list->length ();
-- parameter_list->length (length_contexts + 1);
-- (*parameter_list)[length_contexts].argument <<= this->contexts_;
--
-- (*parameter_list)[length_contexts].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -32447,7 +31874,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -32460,7 +31887,7 @@
+
+
+ CORBA::Any *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -32472,7 +31899,7 @@
+ return result_any;
+ }
+
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -32481,7 +31908,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -32493,7 +31920,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -32506,7 +31933,7 @@
+
+
+ CORBA::Any *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -32522,16 +31949,16 @@
+ }
+
+ void
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::result (IR::ExceptionDefSeq * result)
--{
-- // update the result
-- this->_result = result;
--}
--
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::result (IR_ExceptionDefSeq * result)
+ {
+ // update the result
+ this->_result = result;
+ }
+
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- const IR::ExceptionDefSeq & exceptions,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- exceptions_ (exceptions)
--{}
--
--Dynamic::ParameterList *
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -32539,7 +31966,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_exceptions = parameter_list->length ();
-- parameter_list->length (length_exceptions + 1);
-- (*parameter_list)[length_exceptions].argument <<= this->exceptions_;
--
-- (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -32559,7 +31986,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -32572,7 +31999,7 @@
+
+
+ CORBA::Any *
-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--#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
++IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -32585,17 +32012,19 @@
+ }
+
+ #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));
--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 = OperationDescription
-- 9, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
--
-- 7, ACE_NTOHL (0x72657375), ACE_NTOHL (0x6c740000), // name = result
-- CORBA::tk_TypeCode,
--
-- 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-- CORBA::tk_enum, // typecode kind
-- 100, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/OperationMode:1.0
-- 14, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e4d6f64), ACE_NTOHL (0x65000000), // name = OperationMode
-- 2, // member count
-- 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
--
-- 9, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x65787473), ACE_NTOHL (0x0), // name = contexts
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = ContextIdSeq
-- CORBA::tk_sequence, // typecode kind
-- 160, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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
-- 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_string,
-- 0U, // string length
--
--
-- 0U,
--
--
-- 11, ACE_NTOHL (0x70617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72730000), // name = parameters
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = ParDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 404, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = ParameterDescription
-- 4, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
--
-- 9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0), // name = type_def
-- CORBA::tk_objref, // typecode kind
-- 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
++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
+@@ -32709,7 +32138,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
--
-- 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-- CORBA::tk_enum, // typecode kind
-- 116, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x6172616d), ACE_NTOHL (0x65746572), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ParameterMode:1.0
-- 14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000), // name = ParameterMode
-- 3, // member count
-- 9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0), // name = PARAM_IN
-- 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
--
--
-- 0U,
--
--
-- 11, ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = exceptions
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = ExcDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 456, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = ExceptionDescription
-- 5, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
--
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
--
--
-- 0U,
--
--
--};
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
+ CORBA::tk_enum, // typecode kind
+@@ -32785,28 +32214,25 @@
+
+
+ };
-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
++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);
-- delete tmp;
--}
--
++ IR_OperationDescription *tmp = ACE_static_cast (IR_OperationDescription*,x);
+ delete tmp;
+ }
+
-
-#if !defined (_IR_REPOSITORYIDSEQ_CS_)
-#define _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
-- :
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-- TAO_Unbounded_String_Sequence
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
-- TAO_Unbounded_String_Sequence
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-- (max)
--{}
++IR_RepositoryIdSeq::IR_RepositoryIdSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ TAO_Unbounded_String_Sequence
+@@ -32815,7 +32241,7 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
-IR::RepositoryIdSeq::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 */
-- (max, length, buffer, 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
+@@ -32824,7 +32250,7 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
-IR::RepositoryIdSeq::RepositoryIdSeq (const 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 */
-- (seq)
--{}
++IR_RepositoryIdSeq::IR_RepositoryIdSeq (const IR_RepositoryIdSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ TAO_Unbounded_String_Sequence
+@@ -32833,17 +32259,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);
-- delete tmp;
--}
--
++ 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
-- 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 = RepositoryIdSeq
-- CORBA::tk_sequence, // typecode kind
-- 84, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 0U,
--
--};
+ static const CORBA::Long _oc_IR_RepositoryIdSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -32863,7 +32286,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));
--TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
--TAO_NAMESPACE_BEGIN (IR)
--TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RepositoryIdSeq, &_tc_TAO_tc_IR_RepositoryIdSeq)
--TAO_NAMESPACE_END
--
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
++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)
+@@ -32871,18 +32294,15 @@
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CS_
-
-- void
+ 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;
-- tmp = _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (length);
--
-- if (this->buffer_ != 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_);
--
-- 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
++ IR_OperationDescription *old = ACE_reinterpret_cast (IR_OperationDescription *,this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp[i] = old[i];
+@@ -32895,75 +32315,65 @@
+ }
+
+ void
- IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_deallocate_buffer (void)
-- {
-- if (this->buffer_ == 0 || this->release_ == 0)
-- return;
--
++ _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;
-- }
--
++ 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.
-- {
-- this->_deallocate_buffer ();
-- }
--
++ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::~_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (void) // Dtor.
+ {
+ this->_deallocate_buffer ();
+ }
+
-
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
--
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_OPDESCRIPTIONSEQ_CS_)
-#define _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
-- :
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-- _TAO_Unbounded_Sequence_IR_OpDescriptionSeq
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
++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 */
-- (max)
--{}
++ 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)
-- :
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-- _TAO_Unbounded_Sequence_IR_OpDescriptionSeq
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
++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 */
-- (max, length, buffer, release)
--{}
++ TAO_Unbounded_Sequence<IR_OperationDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
-IR::OpDescriptionSeq::OpDescriptionSeq (const OpDescriptionSeq &seq) // copy ctor
-- :
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-- _TAO_Unbounded_Sequence_IR_OpDescriptionSeq
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
++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 */
-- (seq)
--{}
++ 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);
-- delete tmp;
--}
--
++ 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
-- 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 = OpDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 1896, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = OperationDescription
-- 9, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
--
-- 7, ACE_NTOHL (0x72657375), ACE_NTOHL (0x6c740000), // name = result
-- CORBA::tk_TypeCode,
--
-- 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-- CORBA::tk_enum, // typecode kind
-- 100, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/OperationMode:1.0
-- 14, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e4d6f64), ACE_NTOHL (0x65000000), // name = OperationMode
-- 2, // member count
-- 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
--
-- 9, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x65787473), ACE_NTOHL (0x0), // name = contexts
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = ContextIdSeq
-- CORBA::tk_sequence, // typecode kind
-- 160, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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
-- 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_string,
-- 0U, // string length
--
--
-- 0U,
--
--
-- 11, ACE_NTOHL (0x70617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72730000), // name = parameters
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = ParDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 404, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = ParameterDescription
-- 4, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
--
-- 9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0), // name = type_def
-- CORBA::tk_objref, // typecode kind
-- 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
+ static const CORBA::Long _oc_IR_OpDescriptionSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -33085,7 +32495,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
--
-- 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-- CORBA::tk_enum, // typecode kind
-- 116, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x6172616d), ACE_NTOHL (0x65746572), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ParameterMode:1.0
-- 14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000), // name = ParameterMode
-- 3, // member count
-- 9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0), // name = PARAM_IN
-- 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
--
--
-- 0U,
--
--
-- 11, ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = exceptions
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = ExcDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 456, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = ExceptionDescription
-- 5, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
--
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
--
--
-- 0U,
--
--
--
-- 0U,
--
--};
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
+ CORBA::tk_enum, // typecode kind
+@@ -33164,7 +32574,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));
--TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
--TAO_NAMESPACE_BEGIN (IR)
--TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OpDescriptionSeq, &_tc_TAO_tc_IR_OpDescriptionSeq)
--TAO_NAMESPACE_END
--
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
++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)
+@@ -33172,18 +32582,15 @@
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CS_
-
-- void
+ 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;
-- tmp = _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (length);
--
-- if (this->buffer_ != 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_);
--
-- 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
++ IR_AttributeDescription *old = ACE_reinterpret_cast (IR_AttributeDescription *,this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp[i] = old[i];
+@@ -33196,75 +32603,65 @@
+ }
+
+ void
- IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_deallocate_buffer (void)
-- {
-- if (this->buffer_ == 0 || this->release_ == 0)
-- return;
--
++ _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;
-- }
--
++ 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.
-- {
-- this->_deallocate_buffer ();
-- }
--
++ _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::~_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (void) // Dtor.
+ {
+ this->_deallocate_buffer ();
+ }
+
-
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
--
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_ATTRDESCRIPTIONSEQ_CS_)
-#define _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
-- :
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-- _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
++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 */
-- (max)
--{}
++ 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)
-- :
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-- _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
++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 */
-- (max, length, buffer, release)
--{}
++ TAO_Unbounded_Sequence<IR_AttributeDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
-IR::AttrDescriptionSeq::AttrDescriptionSeq (const AttrDescriptionSeq &seq) // copy ctor
-- :
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-- _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
++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 */
-- (seq)
--{}
++ 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);
-- delete tmp;
--}
--
++ 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
-- 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 = AttrDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 1708, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = AttributeDescription
-- 8, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
--
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
--
-- 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-- CORBA::tk_enum, // typecode kind
-- 104, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/AttributeMode:1.0
-- 14, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x654d6f64), ACE_NTOHL (0x65000000), // name = AttributeMode
-- 2, // member count
-- 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
--
-- 15, ACE_NTOHL (0x6765745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = get_exceptions
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = ExcDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 456, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = ExceptionDescription
-- 5, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
--
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
--
--
-- 0U,
--
--
-- 15, ACE_NTOHL (0x7075745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = put_exceptions
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = ExcDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 456, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = ExceptionDescription
-- 5, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
--
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
--
--
-- 0U,
--
--
--
-- 0U,
--
--};
+ static const CORBA::Long _oc_IR_AttrDescriptionSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -33448,7 +32845,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));
--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
--
--///////////////////////////////////////////////////////////////////////
--// Base & Remote Proxy Implementation.
--//
--
++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)
+@@ -33458,15 +32855,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)
--{}
--
--// Remote Implementation of the IDL interface methods
--
++_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 (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
++IR_InterfaceDefSeq * _TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -33475,7 +32872,7 @@
+ ))
+ {
+
- IR::InterfaceDefSeq *_tao_retval = 0;
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
--
--
++ IR_InterfaceDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -33483,8 +32880,8 @@
+ 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 (
-- istub,
-- "_get_base_interfaces",
-- 20,
-- 0,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ 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",
+@@ -33505,7 +32902,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -33561,7 +32958,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
--
++ IR_InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -33627,19 +33024,15 @@
+ return _tao_safe_retval._retn ();
+ }
+
-void IR::_TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
-- CORBA_Object *_collocated_tao_target_,
++void _TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
+ CORBA_Object *_collocated_tao_target_,
- 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 ());
--
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
-
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_set_base_interfaces",
-- 20,
-- 1,
-- istub->orb_core ()
-- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -33665,7 +33058,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- base_interfaces,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << base_interfaces)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
--}
--
++ IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ base_interfaces,
+@@ -33779,7 +33172,7 @@
+
+ }
+
-CORBA::Boolean IR::_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 = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
--
--
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_get_is_abstract",
-- 16,
-- 0,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_abstract (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -33816,7 +33209,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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))
-- ))
-- {
-- TAO_INTERCEPTOR_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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_retval;
--}
--
++ IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -33937,7 +33330,7 @@
+ return _tao_retval;
+ }
+
-void IR::_TAO_InterfaceDef_Remote_Proxy_Impl::is_abstract (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Boolean is_abstract,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
--
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW (CORBA::INTERNAL ());
--
++void _TAO_InterfaceDef_Remote_Proxy_Impl::is_abstract (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Boolean is_abstract,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -33946,10 +33339,6 @@
+ CORBA::SystemException
+ ))
+ {
-
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_set_is_abstract",
-- 16,
-- 1,
-- istub->orb_core ()
-- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -33975,7 +33364,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- is_abstract,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << CORBA::Any::from_boolean (is_abstract))
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
--}
--
++ IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ is_abstract,
+@@ -34089,7 +33478,7 @@
+
+ }
+
-CORBA::Boolean IR::_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 = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
--
--
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_get_is_local",
-- 13,
-- 0,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_local (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -34126,7 +33515,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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))
-- ))
-- {
-- TAO_INTERCEPTOR_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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_retval;
--}
--
++ IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -34247,7 +33636,7 @@
+ return _tao_retval;
+ }
+
-void IR::_TAO_InterfaceDef_Remote_Proxy_Impl::is_local (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Boolean is_local,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
--
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW (CORBA::INTERNAL ());
--
++void _TAO_InterfaceDef_Remote_Proxy_Impl::is_local (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -34256,10 +33645,6 @@
+ CORBA::SystemException
+ ))
+ {
-
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_set_is_local",
-- 13,
-- 1,
-- istub->orb_core ()
-- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -34285,7 +33670,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- is_local,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << CORBA::Any::from_boolean (is_local))
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
--}
--
++ IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ is_local,
+@@ -34399,7 +33784,7 @@
+
+ }
+
-CORBA::Boolean IR::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
-- CORBA_Object *_collocated_tao_target_,
-- const char * interface_id,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- CORBA::Boolean _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,
-- "is_a",
-- 4,
-- 1,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
+ CORBA_Object *_collocated_tao_target_,
+ const char * interface_id,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -34437,7 +33822,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- interface_id,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << interface_id)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-- _tao_retval
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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))
-- ))
-- {
-- TAO_INTERCEPTOR_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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_retval;
--}
--
++ IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ interface_id,
+@@ -34569,15 +33954,15 @@
+ return _tao_retval;
+ }
+
-IR::AttributeDef_ptr IR::_TAO_InterfaceDef_Remote_Proxy_Impl::create_attribute (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++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,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
++ 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 ((
+@@ -34585,8 +33970,8 @@
+ ))
+ {
+
- IR::AttributeDef_ptr _tao_retval = IR::AttributeDef::_nil ();
- IR::AttributeDef_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_attribute",
-- 16,
-- 1,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ IR_AttributeDef_ptr _tao_retval = IR_AttributeDef::_nil ();
++ IR_AttributeDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -34614,7 +33999,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute ri (
-- &_tao_call,
-- _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 */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-- (_tao_out << name) &&
-- (_tao_out << version) &&
-- (_tao_out << type) &&
-- (_tao_out << mode) &&
-- (_tao_out << get_exceptions) &&
-- (_tao_out << put_exceptions)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-- 0
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -34693,7 +34078,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
--
++ IR_AttributeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -34759,16 +34144,16 @@
+ return _tao_safe_retval._retn ();
+ }
+
-IR::OperationDef_ptr IR::_TAO_InterfaceDef_Remote_Proxy_Impl::create_operation (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++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,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
++ 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 ((
+@@ -34776,8 +34161,8 @@
+ ))
+ {
+
- IR::OperationDef_ptr _tao_retval = IR::OperationDef::_nil ();
- IR::OperationDef_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_operation",
-- 16,
-- 1,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ IR_OperationDef_ptr _tao_retval = IR_OperationDef::_nil ();
++ IR_OperationDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -34805,7 +34190,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- name,
-- version,
-- result,
-- mode,
-- params,
-- exceptions,
-- contexts,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-- (_tao_out << name) &&
-- (_tao_out << version) &&
-- (_tao_out << result) &&
-- (_tao_out << mode) &&
-- (_tao_out << params) &&
-- (_tao_out << exceptions) &&
-- (_tao_out << contexts)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-- 0
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -34886,7 +34271,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
--
--
--//
--// End Base & Remote Proxy Implemeentation.
--///////////////////////////////////////////////////////////////////////
--
--
--///////////////////////////////////////////////////////////////////////
--// Remote & Base Proxy Broker Implementation
--//
--
++ IR_OperationDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -34962,37 +34347,37 @@
+ // 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)
--{
--}
--
--// Factory Member function Implementation.
--IR::_TAO_InterfaceDef_Remote_Proxy_Broker *IR::_TAO_InterfaceDef_Remote_Proxy_Broker::the_TAO_InterfaceDef_Remote_Proxy_Broker (void)
--{
++_TAO_InterfaceDef_Proxy_Broker::~_TAO_InterfaceDef_Proxy_Broker (void)
+ {
+ }
+
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_InterfaceDef_Remote_Proxy_Broker *
+-IR::_TAO_InterfaceDef_Remote_Proxy_Broker::the_TAO_InterfaceDef_Remote_Proxy_Broker (void)
++_TAO_InterfaceDef_Remote_Proxy_Broker *
++_TAO_InterfaceDef_Remote_Proxy_Broker::the_TAO_InterfaceDef_Remote_Proxy_Broker (void)
+ {
- static ::IR::_TAO_InterfaceDef_Remote_Proxy_Broker remote_proxy_broker;
-- return &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,
-- 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
++_TAO_InterfaceDef_Proxy_Impl&
++_TAO_InterfaceDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_InterfaceDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -35008,113 +34393,111 @@
+
+
+ // default constructor
-IR::InterfaceDef::InterfaceDef (int collocated)
--{
-- this->_tao_setup_collocation (collocated);
--}
--
--// destructor
++IR_InterfaceDef::IR_InterfaceDef (int collocated)
+ {
+ this->IR_InterfaceDef_setup_collocation (collocated);
+ }
+
+ // destructor
-IR::InterfaceDef::~InterfaceDef (void)
--{}
--
--void
--IR::InterfaceDef::_tao_setup_collocation (int collocated)
--{
-- if (collocated)
-- this->the_TAO_InterfaceDef_Proxy_Broker_ =
++IR_InterfaceDef::~IR_InterfaceDef (void)
+ {}
+
+ void
+-IR::InterfaceDef::IR_InterfaceDef_setup_collocation (int collocated)
++IR_InterfaceDef::IR_InterfaceDef_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_InterfaceDef_Proxy_Broker_ =
- ::IR__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer (this);
-- else
-- this->the_TAO_InterfaceDef_Proxy_Broker_ =
++ _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 ();
++ _TAO_InterfaceDef_Remote_Proxy_Broker::the_TAO_InterfaceDef_Remote_Proxy_Broker ();
+
+ this->IR_Container_setup_collocation (collocated);
-
-- 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);
--}
--
+ this->IR_Contained_setup_collocation (collocated);
+-
+ this->IR_IDLType_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);
-- CORBA::release (tmp);
--}
--
++ 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))
++IR_InterfaceDef_ptr IR_InterfaceDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
- return InterfaceDef::_nil ();
-- if (! obj->_is_local ())
-- {
-- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/InterfaceDef:1.0", ACE_TRY_ENV);
++ 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 ());
-- if (is_a == 0)
++ 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 (
-- CORBA::Object_ptr obj,
-- CORBA::Environment &
-- )
--{
-- if (CORBA::is_nil (obj))
++IR_InterfaceDef_ptr IR_InterfaceDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
- return InterfaceDef::_nil ();
-- if (! obj->_is_local ())
-- {
-- TAO_Stub* stub = obj->_stubobj ();
-- if (stub)
-- stub->_incr_refcnt ();
++ return IR_InterfaceDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
- InterfaceDef_ptr default_proxy = InterfaceDef::_nil ();
--
-- if (
-- !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-- stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
++ 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
-- )
-- {
-- ACE_NEW_RETURN (
-- default_proxy,
++ obj->_is_collocated () &&_TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
- ::IR::InterfaceDef (
-- stub,
-- 1,
-- obj->_servant ()),
--
++ ::IR_InterfaceDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
- InterfaceDef::_nil ());
-- }
-- if (CORBA::is_nil (default_proxy))
++ IR_InterfaceDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, ::IR::InterfaceDef (stub, 0, obj->_servant ()), InterfaceDef::_nil ());
-- return default_proxy;
-- }
-- else
-- return
-- ACE_reinterpret_cast
-- (
++ ACE_NEW_RETURN (default_proxy, ::IR_InterfaceDef (stub, 0, obj->_servant ()), IR_InterfaceDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
- InterfaceDef_ptr,
-- obj->_tao_QueryInterface
-- (
-- ACE_reinterpret_cast
-- (
-- ptr_arith_t,
++ 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)
--{
-- if (!CORBA::is_nil (obj))
-- obj->_add_ref ();
-- return 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)
--{
-- 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);
--}
--
++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")) ||
+@@ -35128,58 +34511,58 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
-void *IR::InterfaceDef::_tao_QueryInterface (ptr_arith_t type)
--{
-- void *retv = 0;
-- if (type == ACE_reinterpret_cast
-- (ptr_arith_t,
++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))
-- retv = ACE_reinterpret_cast (void*, this);
-- else 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,
- &ACE_NESTED_CLASS (::IR, Container)::_narrow))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
- IR::IDLType_ptr,
-- this
-- )
-- );
-- else if (type == ACE_reinterpret_cast
-- (ptr_arith_t,
++ 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::_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;
--}
--
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -35192,12 +34575,12 @@
+ return retv;
+ }
+
-const char* IR::InterfaceDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/InterfaceDef:1.0";
--}
--
++const char* IR_InterfaceDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/InterfaceDef:1.0";
+ }
+
-IR::InterfaceDefSeq * IR::InterfaceDef::base_interfaces (
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- return this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).base_interfaces (
-- this,
-- ACE_TRY_ENV
-- );
--}
--
++IR_InterfaceDefSeq * IR_InterfaceDef::base_interfaces (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -35214,8 +34597,8 @@
+ );
+ }
+
-void IR::InterfaceDef::base_interfaces (
- const IR::InterfaceDefSeq & base_interfaces,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).base_interfaces (
-- this,
-- base_interfaces,
-- ACE_TRY_ENV
-- );
--}
--
++void IR_InterfaceDef::base_interfaces (
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -35233,7 +34616,7 @@
+ );
+ }
+
-CORBA::Boolean IR::InterfaceDef::is_abstract (
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- return this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_abstract (
-- this,
-- ACE_TRY_ENV
-- );
--}
--
++CORBA::Boolean IR_InterfaceDef::is_abstract (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -35250,7 +34633,7 @@
+ );
+ }
+
-void IR::InterfaceDef::is_abstract (
-- CORBA::Boolean is_abstract,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_abstract (
-- this,
-- is_abstract,
-- ACE_TRY_ENV
-- );
--}
--
++void IR_InterfaceDef::is_abstract (
+ CORBA::Boolean is_abstract,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -35269,7 +34652,7 @@
+ );
+ }
+
-CORBA::Boolean IR::InterfaceDef::is_local (
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- return this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_local (
-- this,
-- ACE_TRY_ENV
-- );
--}
--
++CORBA::Boolean IR_InterfaceDef::is_local (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -35286,7 +34669,7 @@
+ );
+ }
+
-void IR::InterfaceDef::is_local (
-- CORBA::Boolean is_local,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_local (
-- this,
-- is_local,
-- ACE_TRY_ENV
-- );
--}
--
++void IR_InterfaceDef::is_local (
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -35305,7 +34688,7 @@
+ );
+ }
+
-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
-- );
--}
--
++CORBA::Boolean IR_InterfaceDef::is_a (
+ const char * interface_id,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -35324,14 +34707,14 @@
+ );
+ }
+
-IR::AttributeDef_ptr IR::InterfaceDef::create_attribute (
-- const char * id,
-- const char * name,
-- const char * version,
++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_IDLType_ptr type,
++ IR_AttributeMode mode,
++ const IR_ExceptionDefSeq & get_exceptions,
++ const IR_ExceptionDefSeq & put_exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -35355,15 +34738,15 @@
+ );
+ }
+
-IR::OperationDef_ptr IR::InterfaceDef::create_operation (
-- const char * id,
-- const char * name,
-- const char * version,
++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
-- );
--}
--
++ 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 ((
+@@ -35388,9 +34771,8 @@
+ );
+ }
+
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -35399,7 +34781,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -35411,7 +34793,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -35424,7 +34806,7 @@
+
+
+ CORBA::Any *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -35440,16 +34822,16 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- const IR::InterfaceDefSeq & base_interfaces,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- base_interfaces_ (base_interfaces)
--{}
--
--Dynamic::ParameterList *
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -35457,7 +34839,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_base_interfaces = parameter_list->length ();
-- parameter_list->length (length_base_interfaces + 1);
-- (*parameter_list)[length_base_interfaces].argument <<= this->base_interfaces_;
--
-- (*parameter_list)[length_base_interfaces].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -35477,7 +34859,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -35490,7 +34872,7 @@
+
+
+ CORBA::Any *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -35502,7 +34884,7 @@
+ return result_any;
+ }
+
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -35511,7 +34893,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -35523,7 +34905,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -35536,7 +34918,7 @@
+
+
+ CORBA::Any *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-- return safe_result_any._retn ();
--}
--
--void
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -35552,13 +34934,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const CORBA::Boolean & is_abstract,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- is_abstract_ (is_abstract)
--{}
--
--Dynamic::ParameterList *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const CORBA::Boolean & is_abstract,
+@@ -35569,7 +34951,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_is_abstract = parameter_list->length ();
-- parameter_list->length (length_is_abstract + 1);
-- (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
-- (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -35588,7 +34970,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -35601,7 +34983,7 @@
+
+
+ CORBA::Any *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -35613,7 +34995,7 @@
+ return result_any;
+ }
+
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -35622,7 +35004,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -35634,7 +35016,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -35647,7 +35029,7 @@
+
+
+ CORBA::Any *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-- return safe_result_any._retn ();
--}
--
--void
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -35663,13 +35045,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const CORBA::Boolean & is_local,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- is_local_ (is_local)
--{}
--
--Dynamic::ParameterList *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const CORBA::Boolean & is_local,
+@@ -35680,7 +35062,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_is_local = parameter_list->length ();
-- parameter_list->length (length_is_local + 1);
-- (*parameter_list)[length_is_local].argument <<= CORBA::Any::from_boolean (this->is_local_);
-- (*parameter_list)[length_is_local].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -35699,7 +35081,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -35712,7 +35094,7 @@
+
+
+ CORBA::Any *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -35724,7 +35106,7 @@
+ return result_any;
+ }
+
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::TAO_ClientRequestInfo_IR_InterfaceDef_is_a (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * interface_id,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- interface_id_ (interface_id)
--{}
--
--Dynamic::ParameterList *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::TAO_ClientRequestInfo_IR_InterfaceDef_is_a (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * interface_id,
+@@ -35735,7 +35117,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_interface_id = parameter_list->length ();
-- parameter_list->length (length_interface_id + 1);
-- (*parameter_list)[length_interface_id].argument <<= interface_id_;
-- (*parameter_list)[length_interface_id].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -35754,7 +35136,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -35767,7 +35149,7 @@
+
+
+ CORBA::Any *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-- return safe_result_any._retn ();
--}
--
--void
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -35783,22 +35165,22 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- type_ (type),
-- mode_ (mode),
-- get_exceptions_ (get_exceptions),
-- put_exceptions_ (put_exceptions)
--{}
--
--Dynamic::ParameterList *
++ IR_IDLType_ptr type,
++ IR_AttributeMode & mode,
++ const IR_ExceptionDefSeq & get_exceptions,
++ const IR_ExceptionDefSeq & put_exceptions,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -35812,7 +35194,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_type = parameter_list->length ();
-- parameter_list->length (length_type + 1);
-- (*parameter_list)[length_type].argument <<= this->type_;
--
-- (*parameter_list)[length_type].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_mode = parameter_list->length ();
-- parameter_list->length (length_mode + 1);
-- (*parameter_list)[length_mode].argument <<= this->mode_;
--
-- (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_get_exceptions = parameter_list->length ();
-- parameter_list->length (length_get_exceptions + 1);
-- (*parameter_list)[length_get_exceptions].argument <<= this->get_exceptions_;
--
-- (*parameter_list)[length_get_exceptions].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_put_exceptions = parameter_list->length ();
-- parameter_list->length (length_put_exceptions + 1);
-- (*parameter_list)[length_put_exceptions].argument <<= this->put_exceptions_;
--
-- (*parameter_list)[length_put_exceptions].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -35865,7 +35247,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -35878,7 +35260,7 @@
+
+
+ CORBA::Any *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -35894,23 +35276,23 @@
+ }
+
+ void
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::result (IR::AttributeDef_ptr result)
--{
-- // update the result
-- this->_result = result;
--}
--
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::result (IR_AttributeDef_ptr result)
+ {
+ // update the result
+ this->_result = result;
+ }
+
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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 &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- result_ (result),
-- mode_ (mode),
-- params_ (params),
-- exceptions_ (exceptions),
-- contexts_ (contexts)
--{}
--
--Dynamic::ParameterList *
++ IR_IDLType_ptr result,
++ IR_OperationMode & mode,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -35925,7 +35307,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_result = parameter_list->length ();
-- parameter_list->length (length_result + 1);
-- (*parameter_list)[length_result].argument <<= this->result_;
--
-- (*parameter_list)[length_result].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_mode = parameter_list->length ();
-- parameter_list->length (length_mode + 1);
-- (*parameter_list)[length_mode].argument <<= this->mode_;
--
-- (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_params = parameter_list->length ();
-- parameter_list->length (length_params + 1);
-- (*parameter_list)[length_params].argument <<= this->params_;
--
-- (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_exceptions = parameter_list->length ();
-- parameter_list->length (length_exceptions + 1);
-- (*parameter_list)[length_exceptions].argument <<= this->exceptions_;
--
-- (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_contexts = parameter_list->length ();
-- parameter_list->length (length_contexts + 1);
-- (*parameter_list)[length_contexts].argument <<= this->contexts_;
--
-- (*parameter_list)[length_contexts].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -35984,7 +35366,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -35997,7 +35379,7 @@
+
+
+ CORBA::Any *
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -36013,24 +35395,26 @@
+ }
+
+ void
-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::result (IR::OperationDef_ptr result)
--{
-- // update the result
-- this->_result = result;
--}
--
--#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
++IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::result (IR_OperationDef_ptr result)
+ {
+ // update the result
+ this->_result = result;
+ }
+
+ #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));
--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 = InterfaceDescription
-- 10, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
--
-- 11, ACE_NTOHL (0x6f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e730000), // name = operations
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = OpDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 1896, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = OperationDescription
-- 9, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
--
-- 7, ACE_NTOHL (0x72657375), ACE_NTOHL (0x6c740000), // name = result
-- CORBA::tk_TypeCode,
--
-- 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-- CORBA::tk_enum, // typecode kind
-- 100, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/OperationMode:1.0
-- 14, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e4d6f64), ACE_NTOHL (0x65000000), // name = OperationMode
-- 2, // member count
-- 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
--
-- 9, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x65787473), ACE_NTOHL (0x0), // name = contexts
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = ContextIdSeq
-- CORBA::tk_sequence, // typecode kind
-- 160, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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
-- 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_string,
-- 0U, // string length
--
--
-- 0U,
--
--
-- 11, ACE_NTOHL (0x70617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72730000), // name = parameters
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = ParDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 404, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = ParameterDescription
-- 4, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
--
-- 9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0), // name = type_def
-- CORBA::tk_objref, // typecode kind
-- 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
++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
+@@ -36195,7 +35579,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
--
-- 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-- CORBA::tk_enum, // typecode kind
-- 116, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x6172616d), ACE_NTOHL (0x65746572), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ParameterMode:1.0
-- 14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000), // name = ParameterMode
-- 3, // member count
-- 9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0), // name = PARAM_IN
-- 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
--
--
-- 0U,
--
--
-- 11, ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = exceptions
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = ExcDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 456, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = ExceptionDescription
-- 5, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
--
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
--
--
-- 0U,
--
--
--
-- 0U,
--
--
-- 11, ACE_NTOHL (0x61747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65730000), // name = attributes
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = AttrDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 1708, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = AttributeDescription
-- 8, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
--
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
--
-- 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-- CORBA::tk_enum, // typecode kind
-- 104, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/AttributeMode:1.0
-- 14, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x654d6f64), ACE_NTOHL (0x65000000), // name = AttributeMode
-- 2, // member count
-- 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
--
-- 15, ACE_NTOHL (0x6765745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = get_exceptions
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = ExcDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 456, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = ExceptionDescription
-- 5, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
--
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
--
--
-- 0U,
--
--
-- 15, ACE_NTOHL (0x7075745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = put_exceptions
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = ExcDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 456, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = ExceptionDescription
-- 5, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
--
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
--
--
-- 0U,
--
--
--
-- 0U,
--
--
-- 16, ACE_NTOHL (0x62617365), ACE_NTOHL (0x5f696e74), ACE_NTOHL (0x65726661), ACE_NTOHL (0x63657300), // name = base_interfaces
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = RepositoryIdSeq
-- CORBA::tk_sequence, // typecode kind
-- 84, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 0U,
--
--
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
--
-- 12, ACE_NTOHL (0x69735f61), ACE_NTOHL (0x62737472), ACE_NTOHL (0x61637400), // name = is_abstract
-- CORBA::tk_boolean,
--
-- 9, ACE_NTOHL (0x69735f6c), ACE_NTOHL (0x6f63616c), ACE_NTOHL (0x0), // name = is_local
-- CORBA::tk_boolean,
--
--};
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
+ CORBA::tk_enum, // typecode kind
+@@ -36488,14 +35872,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));
--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
++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);
-- delete tmp;
--}
--
--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 = ValueMember
-- 7, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
--
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
--
-- 9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0), // name = type_def
-- CORBA::tk_objref, // typecode kind
-- 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
++ IR_InterfaceDescription *tmp = ACE_static_cast (IR_InterfaceDescription*,x);
+ delete tmp;
+ }
+
+@@ -36549,7 +35934,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
--
-- 7, ACE_NTOHL (0x61636365), ACE_NTOHL (0x73730000), // name = access
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
--
--
--};
++ 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
+@@ -36561,32 +35946,30 @@
+
+
+ };
-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
++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);
-- delete tmp;
--}
--
--
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
++ IR_ValueMember *tmp = ACE_static_cast (IR_ValueMember*,x);
+ delete tmp;
+ }
+
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CS_
-
-- void
+ 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;
-- tmp = _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (length);
--
-- if (this->buffer_ != 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_);
--
-- 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
++ IR_ValueMember *old = ACE_reinterpret_cast (IR_ValueMember *,this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp[i] = old[i];
+@@ -36599,75 +35982,65 @@
+ }
+
+ void
- IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::_deallocate_buffer (void)
-- {
-- if (this->buffer_ == 0 || this->release_ == 0)
-- return;
--
++ _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;
-- }
--
++ 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.
-- {
-- this->_deallocate_buffer ();
-- }
--
++ _TAO_Unbounded_Sequence_IR_ValueMemberSeq::~_TAO_Unbounded_Sequence_IR_ValueMemberSeq (void) // Dtor.
+ {
+ this->_deallocate_buffer ();
+ }
+
-
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
--
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_VALUEMEMBERSEQ_CS_)
-#define _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
-- :
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-- _TAO_Unbounded_Sequence_IR_ValueMemberSeq
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
++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 */
-- (max)
--{}
++ 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)
-- :
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-- _TAO_Unbounded_Sequence_IR_ValueMemberSeq
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
++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 */
-- (max, length, buffer, release)
--{}
++ TAO_Unbounded_Sequence<IR_ValueMember>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
-IR::ValueMemberSeq::ValueMemberSeq (const ValueMemberSeq &seq) // copy ctor
-- :
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-- _TAO_Unbounded_Sequence_IR_ValueMemberSeq
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
++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 */
-- (seq)
--{}
++ 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);
-- delete tmp;
--}
--
++ 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
-- 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 = ValueMemberSeq
-- CORBA::tk_sequence, // typecode kind
-- 592, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = ValueMember
-- 7, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
--
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
--
-- 9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0), // name = type_def
-- CORBA::tk_objref, // typecode kind
-- 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
+ static const CORBA::Long _oc_IR_ValueMemberSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -36726,7 +36099,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
--
-- 7, ACE_NTOHL (0x61636365), ACE_NTOHL (0x73730000), // name = access
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
--
--
--
-- 0U,
--
--};
++ 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
+@@ -36741,7 +36114,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));
--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
--
--///////////////////////////////////////////////////////////////////////
--// Base & Remote Proxy Implementation.
--//
--
++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)
+@@ -36751,15 +36124,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)
--{}
--
--// Remote Implementation of the IDL interface methods
--
++_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_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 ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++CORBA::TypeCode_ptr _TAO_ValueMemberDef_Remote_Proxy_Impl::type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -36797,7 +36170,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
--
++ IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -36919,7 +36292,7 @@
+ return _tao_safe_retval._retn ();
+ }
+
-IR::IDLType_ptr IR::_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_ValueMemberDef_Remote_Proxy_Impl::type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -36928,8 +36301,8 @@
+ ))
+ {
+
- 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",
-- 13,
-- 0,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
++ IR_IDLType_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -36957,7 +36330,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -37013,7 +36386,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
--
++ IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -37079,19 +36452,15 @@
+ return _tao_safe_retval._retn ();
+ }
+
-void IR::_TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
-- CORBA_Object *_collocated_tao_target_,
++void _TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
+ CORBA_Object *_collocated_tao_target_,
- IR::IDLType_ptr type_def,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
--
--
++ 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",
-- 13,
-- 1,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -37117,7 +36486,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- type_def,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << type_def)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
--}
--
++ IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ type_def,
+@@ -37231,7 +36600,7 @@
+
+ }
+
-CORBA::Visibility IR::_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 = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
--
--
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_get_access",
-- 11,
-- 0,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++CORBA::Visibility _TAO_ValueMemberDef_Remote_Proxy_Impl::access (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -37268,7 +36637,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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)
-- ))
-- {
-- TAO_INTERCEPTOR_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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_retval;
--}
--
++ IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -37389,7 +36758,7 @@
+ return _tao_retval;
+ }
+
-void IR::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Visibility access,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
--
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW (CORBA::INTERNAL ());
--
++void _TAO_ValueMemberDef_Remote_Proxy_Impl::access (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Visibility access,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -37398,10 +36767,6 @@
+ CORBA::SystemException
+ ))
+ {
-
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_set_access",
-- 11,
-- 1,
-- istub->orb_core ()
-- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -37427,7 +36792,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- access,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << access)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
--}
--
--
--//
--// End Base & Remote Proxy Implemeentation.
--///////////////////////////////////////////////////////////////////////
--
--
--///////////////////////////////////////////////////////////////////////
--// Remote & Base Proxy Broker Implementation
--//
--
++ IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ access,
+@@ -37551,37 +36916,37 @@
+ // 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)
--{
--}
--
--// Factory Member function Implementation.
--IR::_TAO_ValueMemberDef_Remote_Proxy_Broker *IR::_TAO_ValueMemberDef_Remote_Proxy_Broker::the_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
--{
++_TAO_ValueMemberDef_Proxy_Broker::~_TAO_ValueMemberDef_Proxy_Broker (void)
+ {
+ }
+
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_ValueMemberDef_Remote_Proxy_Broker *
+-IR::_TAO_ValueMemberDef_Remote_Proxy_Broker::the_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
++_TAO_ValueMemberDef_Remote_Proxy_Broker *
++_TAO_ValueMemberDef_Remote_Proxy_Broker::the_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
+ {
- static ::IR::_TAO_ValueMemberDef_Remote_Proxy_Broker remote_proxy_broker;
-- return &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,
-- 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
++_TAO_ValueMemberDef_Proxy_Impl&
++_TAO_ValueMemberDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_ValueMemberDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -37597,109 +36962,109 @@
+
+
+ // default constructor
-IR::ValueMemberDef::ValueMemberDef (int collocated)
--{
-- this->_tao_setup_collocation (collocated);
--}
--
--// destructor
++IR_ValueMemberDef::IR_ValueMemberDef (int collocated)
+ {
+ this->IR_ValueMemberDef_setup_collocation (collocated);
+ }
+
+ // destructor
-IR::ValueMemberDef::~ValueMemberDef (void)
--{}
--
--void
--IR::ValueMemberDef::_tao_setup_collocation (int collocated)
--{
-- if (collocated)
-- this->the_TAO_ValueMemberDef_Proxy_Broker_ =
++IR_ValueMemberDef::~IR_ValueMemberDef (void)
+ {}
+
+ void
+-IR::ValueMemberDef::IR_ValueMemberDef_setup_collocation (int collocated)
++IR_ValueMemberDef::IR_ValueMemberDef_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_ValueMemberDef_Proxy_Broker_ =
- ::IR__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer (this);
-- else
-- this->the_TAO_ValueMemberDef_Proxy_Broker_ =
++ _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 ();
--
-- ACE_NESTED_CLASS (IR, Contained)::_tao_setup_collocation (collocated);
--}
--
++ _TAO_ValueMemberDef_Remote_Proxy_Broker::the_TAO_ValueMemberDef_Remote_Proxy_Broker ();
+
+ this->IR_Contained_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);
-- CORBA::release (tmp);
--}
--
++ 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))
++IR_ValueMemberDef_ptr IR_ValueMemberDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
- return ValueMemberDef::_nil ();
-- if (! obj->_is_local ())
-- {
-- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ValueMemberDef:1.0", ACE_TRY_ENV);
++ 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 ());
-- if (is_a == 0)
++ 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 (
-- CORBA::Object_ptr obj,
-- CORBA::Environment &
-- )
--{
-- if (CORBA::is_nil (obj))
++IR_ValueMemberDef_ptr IR_ValueMemberDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
- return ValueMemberDef::_nil ();
-- if (! obj->_is_local ())
-- {
-- TAO_Stub* stub = obj->_stubobj ();
-- if (stub)
-- stub->_incr_refcnt ();
++ return IR_ValueMemberDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
- ValueMemberDef_ptr default_proxy = ValueMemberDef::_nil ();
--
-- if (
-- !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-- stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
++ 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
-- )
-- {
-- ACE_NEW_RETURN (
-- default_proxy,
++ obj->_is_collocated () &&_TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
- ::IR::ValueMemberDef (
-- stub,
-- 1,
-- obj->_servant ()),
--
++ ::IR_ValueMemberDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
- ValueMemberDef::_nil ());
-- }
-- if (CORBA::is_nil (default_proxy))
++ IR_ValueMemberDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, ::IR::ValueMemberDef (stub, 0, obj->_servant ()), ValueMemberDef::_nil ());
-- return default_proxy;
-- }
-- else
-- return
-- ACE_reinterpret_cast
-- (
++ ACE_NEW_RETURN (default_proxy, ::IR_ValueMemberDef (stub, 0, obj->_servant ()), IR_ValueMemberDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
- ValueMemberDef_ptr,
-- obj->_tao_QueryInterface
-- (
-- ACE_reinterpret_cast
-- (
-- ptr_arith_t,
++ 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)
--{
-- if (!CORBA::is_nil (obj))
-- obj->_add_ref ();
-- return 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)
--{
-- 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);
--}
--
++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")) ||
+@@ -37711,34 +37076,34 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
-void *IR::ValueMemberDef::_tao_QueryInterface (ptr_arith_t type)
--{
-- void *retv = 0;
-- if (type == ACE_reinterpret_cast
-- (ptr_arith_t,
++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))
-- retv = ACE_reinterpret_cast (void*, this);
-- else 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,
- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_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::_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;
--}
--
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -37751,12 +37116,12 @@
+ return retv;
+ }
+
-const char* IR::ValueMemberDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/ValueMemberDef:1.0";
--}
--
++const char* IR_ValueMemberDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/ValueMemberDef:1.0";
+ }
+
-CORBA::TypeCode_ptr IR::ValueMemberDef::type (
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- return this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type (
-- this,
-- ACE_TRY_ENV
-- );
--}
--
++CORBA::TypeCode_ptr IR_ValueMemberDef::type (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -37773,7 +37138,7 @@
+ );
+ }
+
-IR::IDLType_ptr IR::ValueMemberDef::type_def (
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- return this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type_def (
-- this,
-- ACE_TRY_ENV
-- );
--}
--
++IR_IDLType_ptr IR_ValueMemberDef::type_def (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -37790,8 +37155,8 @@
+ );
+ }
+
-void IR::ValueMemberDef::type_def (
- IR::IDLType_ptr type_def,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type_def (
-- this,
-- type_def,
-- ACE_TRY_ENV
-- );
--}
--
++void IR_ValueMemberDef::type_def (
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -37809,7 +37174,7 @@
+ );
+ }
+
-CORBA::Visibility IR::ValueMemberDef::access (
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- return this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).access (
-- this,
-- ACE_TRY_ENV
-- );
--}
--
++CORBA::Visibility IR_ValueMemberDef::access (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -37826,7 +37191,7 @@
+ );
+ }
+
-void IR::ValueMemberDef::access (
-- CORBA::Visibility access,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).access (
-- this,
-- access,
-- ACE_TRY_ENV
-- );
--}
--
++void IR_ValueMemberDef::access (
+ CORBA::Visibility access,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -37845,9 +37210,8 @@
+ );
+ }
+
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -37856,7 +37220,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -37868,7 +37232,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -37881,7 +37245,7 @@
+
+
+ CORBA::Any *
-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -37897,13 +37261,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -37912,7 +37276,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -37924,7 +37288,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -37937,7 +37301,7 @@
+
+
+ CORBA::Any *
-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -37953,16 +37317,16 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- IR::IDLType_ptr type_def,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- type_def_ (type_def)
--{}
--
--Dynamic::ParameterList *
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -37970,7 +37334,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_type_def = parameter_list->length ();
-- parameter_list->length (length_type_def + 1);
-- (*parameter_list)[length_type_def].argument <<= this->type_def_;
--
-- (*parameter_list)[length_type_def].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -37990,7 +37354,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -38003,7 +37367,7 @@
+
+
+ CORBA::Any *
-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
++IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -38015,7 +37379,7 @@
+ return result_any;
+ }
+
-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -38024,7 +37388,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -38036,7 +37400,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -38049,7 +37413,7 @@
+
+
+ CORBA::Any *
-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -38065,13 +37429,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const CORBA::Visibility & access,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- access_ (access)
--{}
--
--Dynamic::ParameterList *
++IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const CORBA::Visibility & access,
+@@ -38082,7 +37446,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_access = parameter_list->length ();
-- parameter_list->length (length_access + 1);
-- (*parameter_list)[length_access].argument <<= access_;
-- (*parameter_list)[length_access].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -38101,7 +37465,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -38114,7 +37478,7 @@
+
+
+ CORBA::Any *
-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
--#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
++IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -38127,13 +37491,14 @@
+ }
+
+ #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));
--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
--
--///////////////////////////////////////////////////////////////////////
--// Base & Remote Proxy Implementation.
--//
--
++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)
+@@ -38143,15 +37508,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)
--{}
--
--// Remote Implementation of the IDL interface methods
--
++_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 (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
++IR_InterfaceDefSeq * _TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -38160,7 +37525,7 @@
+ ))
+ {
+
- IR::InterfaceDefSeq *_tao_retval = 0;
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
--
--
++ IR_InterfaceDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -38168,8 +37533,8 @@
+ 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 (
-- istub,
-- "_get_supported_interfaces",
-- 25,
-- 0,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ 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",
+@@ -38190,7 +37555,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -38246,7 +37611,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
--
++ IR_InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -38312,19 +37677,15 @@
+ return _tao_safe_retval._retn ();
+ }
+
-void IR::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
-- CORBA_Object *_collocated_tao_target_,
++void _TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
- 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 ());
--
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
-
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_set_supported_interfaces",
-- 25,
-- 1,
-- istub->orb_core ()
-- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -38350,7 +37711,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- supported_interfaces,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << supported_interfaces)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
--}
--
++ IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ supported_interfaces,
+@@ -38464,7 +37825,7 @@
+
+ }
+
-IR::InitializerSeq * IR::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
++IR_InitializerSeq * _TAO_ValueDef_Remote_Proxy_Impl::initializers (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -38473,7 +37834,7 @@
+ ))
+ {
+
- IR::InitializerSeq *_tao_retval = 0;
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
--
--
++ IR_InitializerSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -38481,8 +37842,8 @@
+ 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 (
-- istub,
-- "_get_initializers",
-- 17,
-- 0,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ 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",
+@@ -38503,7 +37864,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -38559,7 +37920,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::InitializerSeq * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
--
++ IR_InitializerSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -38625,19 +37986,15 @@
+ return _tao_safe_retval._retn ();
+ }
+
-void IR::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
-- CORBA_Object *_collocated_tao_target_,
++void _TAO_ValueDef_Remote_Proxy_Impl::initializers (
+ CORBA_Object *_collocated_tao_target_,
- 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 ());
--
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
-
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_set_initializers",
-- 17,
-- 1,
-- istub->orb_core ()
-- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -38663,7 +38020,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- initializers,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << initializers)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
--}
--
++ IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ initializers,
+@@ -38777,7 +38134,7 @@
+
+ }
+
-IR::ValueDef_ptr IR::_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_ValueDef_Remote_Proxy_Impl::base_value (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -38786,8 +38143,8 @@
+ ))
+ {
+
- 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,
-- "_get_base_value",
-- 15,
-- 0,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ IR_ValueDef_ptr _tao_retval = IR_ValueDef::_nil ();
++ IR_ValueDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -38815,7 +38172,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -38871,7 +38228,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
--
++ IR_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -38937,19 +38294,15 @@
+ return _tao_safe_retval._retn ();
+ }
+
-void IR::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
-- CORBA_Object *_collocated_tao_target_,
++void _TAO_ValueDef_Remote_Proxy_Impl::base_value (
+ CORBA_Object *_collocated_tao_target_,
- IR::ValueDef_ptr base_value,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
--
--
++ 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 ());
-
-
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_set_base_value",
-- 15,
-- 1,
-- istub->orb_core ()
-- );
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -38975,7 +38328,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- base_value,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << base_value)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
--}
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
++ IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ base_value,
+@@ -39089,7 +38442,7 @@
+
+ }
-IR::ValueDefSeq * IR::_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_ValueDef_Remote_Proxy_Impl::abstract_base_values (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -39098,7 +38451,7 @@
+ ))
+ {
+
- IR::ValueDefSeq *_tao_retval = 0;
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
++ IR_ValueDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -39106,8 +38459,8 @@
+ 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 (
-- istub,
-- "_get_abstract_base_values",
-- 25,
-- 0,
-- istub->orb_core ()
-- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ 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",
+@@ -39128,7 +38481,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -39184,7 +38537,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::ValueDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 0U,
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
++ IR_ValueDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -39250,19 +38603,15 @@
+ return _tao_safe_retval._retn ();
+ }
-void IR::_TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
-- CORBA_Object *_collocated_tao_target_,
++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
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-+ 15, ACE_NTOHL (0x7075745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = put_exceptions
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = ExcDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 456, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = ExceptionDescription
-+ 5, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW (CORBA::INTERNAL ());
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
++ const IR_ValueDefSeq & abstract_base_values,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
-
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_set_abstract_base_values",
-- 25,
-- 1,
-- istub->orb_core ()
-- );
-+ 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
+-
-
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -39288,7 +38637,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- abstract_base_values,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << abstract_base_values)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
--}
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
++ IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ abstract_base_values,
+@@ -39402,7 +38751,7 @@
+
+ }
-CORBA::Boolean IR::_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 = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
--
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_get_is_abstract",
-- 16,
-- 0,
-- istub->orb_core ()
-- );
-+ 0U,
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -39439,7 +38788,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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))
-- ))
-- {
-- TAO_INTERCEPTOR_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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_retval;
--}
++ IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -39560,7 +38909,7 @@
+ return _tao_retval;
+ }
-void IR::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Boolean is_abstract,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-+ 0U,
-
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW (CORBA::INTERNAL ());
-+};
-+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)
-+TAO_NAMESPACE_END
-
++void _TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Boolean is_abstract,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -39569,10 +38918,6 @@
+ CORBA::SystemException
+ ))
+ {
-
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_set_is_abstract",
-- 16,
-- 1,
-- istub->orb_core ()
-- );
-+///////////////////////////////////////////////////////////////////////
-+// Base & Remote Proxy Implementation.
-+//
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
+-
-
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -39598,7 +38943,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- is_abstract,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << CORBA::Any::from_boolean (is_abstract))
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+_TAO_InterfaceDef_Proxy_Impl::_TAO_InterfaceDef_Proxy_Impl (void)
-+{}
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
--}
-+_TAO_InterfaceDef_Remote_Proxy_Impl::_TAO_InterfaceDef_Remote_Proxy_Impl (void)
-+{}
-+
-+// Remote Implementation of the IDL interface methods
++ IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ is_abstract,
+@@ -39712,7 +39057,7 @@
+
+ }
-CORBA::Boolean IR::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
-+IR_InterfaceDefSeq * _TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
++CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_custom (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -39269,168 +18202,77 @@
- ))
- {
-
-- CORBA::Boolean _tao_retval = 0;
-+ IR_InterfaceDefSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-+ 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 (
- istub,
-- "_get_is_custom",
-- 14,
-+ "_get_base_interfaces",
-+ 20,
- 0,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -39749,7 +39094,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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))
-- ))
-- {
-- TAO_INTERCEPTOR_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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ 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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ 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)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_retval;
-+ return _tao_safe_retval._retn ();
++ IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -39870,7 +39215,7 @@
+ return _tao_retval;
}
-void IR::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
-+void _TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
++void _TAO_ValueDef_Remote_Proxy_Impl::is_custom (
CORBA_Object *_collocated_tao_target_,
-- CORBA::Boolean is_custom,
-+ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Boolean is_custom,
CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
+@@ -39879,10 +39224,6 @@
CORBA::SystemException
))
{
@@ -47835,371 +21171,43 @@
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-@@ -39438,139 +18280,54 @@
-
- TAO_GIOP_Twoway_Invocation _tao_call (
- istub,
-- "_set_is_custom",
-- 14,
-+ "_set_base_interfaces",
-+ 20,
- 1,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- is_custom,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << CORBA::Any::from_boolean (is_custom))
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-+ ACE_CHECK;
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << base_interfaces)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
+@@ -39908,7 +39249,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
- }
--
-- break;
-- }
--
-+
-+ break;
-+ }
+ #if TAO_HAS_INTERCEPTORS == 1
+- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set ri (
++ IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ is_custom,
+@@ -40022,7 +39363,7 @@
+
}
-CORBA::Boolean IR::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
-+CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_abstract (
++CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -39589,158 +18346,65 @@
-
- TAO_GIOP_Twoway_Invocation _tao_call (
- istub,
-- "_get_is_truncatable",
-- 19,
-+ "_get_is_abstract",
-+ 16,
- 0,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -40059,7 +39400,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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))
-- ))
-- {
-- TAO_INTERCEPTOR_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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ ACE_CHECK_RETURN (_tao_retval);
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ _tao_retval
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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
-+ );
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -40180,7 +39521,7 @@
return _tao_retval;
}
-void IR::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
-+void _TAO_InterfaceDef_Remote_Proxy_Impl::is_abstract (
++void _TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
CORBA_Object *_collocated_tao_target_,
-- CORBA::Boolean is_truncatable,
-+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_truncatable,
CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
+@@ -40189,10 +39530,6 @@
CORBA::SystemException
))
{
@@ -48210,673 +21218,83 @@
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-@@ -39748,141 +18412,55 @@
-
- TAO_GIOP_Twoway_Invocation _tao_call (
- istub,
-- "_set_is_truncatable",
-- 19,
-+ "_set_is_abstract",
-+ 16,
- 1,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- is_truncatable,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << CORBA::Any::from_boolean (is_truncatable))
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- 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_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
+@@ -40218,7 +39555,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
- }
--
-- break;
-- }
--
-+
-+ break;
-+ }
+ #if TAO_HAS_INTERCEPTORS == 1
+- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set ri (
++ IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ is_truncatable,
+@@ -40332,7 +39669,7 @@
+
}
-CORBA::Boolean IR::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
-+CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_local (
++CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_a (
CORBA_Object *_collocated_tao_target_,
-- const char * id,
+ const char * id,
CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
-@@ -39900,163 +18478,122 @@
-
- TAO_GIOP_Twoway_Invocation _tao_call (
- istub,
-- "is_a",
-- 4,
-- 1,
-+ "_get_is_local",
-+ 13,
-+ 0,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
-+ );
-+ ACE_CHECK_RETURN (_tao_retval);
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ 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),
- _tao_retval
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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))
-- ))
-- {
-- TAO_INTERCEPTOR_THROW_RETURN (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
-- CORBA::Boolean _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ }
-+ break;
-+ }
-+
-+ return _tao_retval;
-+}
-+
-+void _TAO_InterfaceDef_Remote_Proxy_Impl::is_local (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Boolean is_local,
-+ 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_is_local",
-+ 13,
-+ 1,
-+ istub->orb_core ()
-+ );
-+
-+ for (;;)
-+ {
-+ _tao_call.start (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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- 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_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
+@@ -40370,7 +39707,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
- }
--
-- break;
-- }
-- return _tao_retval;
-+
-+ break;
-+ }
+ #if TAO_HAS_INTERCEPTORS == 1
+- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a ri (
++ IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -40502,12 +39839,12 @@
+ return _tao_retval;
}
-IR::ValueMemberDef_ptr IR::_TAO_ValueDef_Remote_Proxy_Impl::create_value_member (
-+CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
++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,
+ const char * id,
+ const char * name,
+ const char * version,
- IR::IDLType_ptr type,
-- CORBA::Visibility access,
-+ const char * interface_id,
++ IR_IDLType_ptr type,
+ CORBA::Visibility access,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
-@@ -40064,185 +18601,85 @@
+@@ -40516,8 +39853,8 @@
))
{
- IR::ValueMemberDef_ptr _tao_retval = IR::ValueMemberDef::_nil ();
- IR::ValueMemberDef_var _tao_safe_retval (_tao_retval);
-+ CORBA::Boolean _tao_retval = 0;
++ IR_ValueMemberDef_ptr _tao_retval = IR_ValueMemberDef::_nil ();
++ IR_ValueMemberDef_var _tao_safe_retval (_tao_retval);
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
- TAO_GIOP_Twoway_Invocation _tao_call (
- istub,
-- "create_value_member",
-- 19,
-+ "is_a",
-+ 4,
- 1,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -40545,7 +39882,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- name,
-- version,
-- type,
-- access,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-- (_tao_out << name) &&
-- (_tao_out << version) &&
-- (_tao_out << type) &&
-- (_tao_out << access)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-- 0
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -40620,7 +39957,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- 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_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
-
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ _tao_retval
-+ );
- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
-+ 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
-+ );
-+ }
-+ break;
-+ }
-+
-+ return _tao_retval;
++ IR_ValueMemberDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -40686,15 +40023,15 @@
+ return _tao_safe_retval._retn ();
}
-IR::AttributeDef_ptr IR::_TAO_ValueDef_Remote_Proxy_Impl::create_attribute (
-+IR_AttributeDef_ptr _TAO_InterfaceDef_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,
@@ -48892,7 +21310,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -40250,8 +18687,8 @@
+@@ -40702,8 +40039,8 @@
))
{
@@ -48903,214 +21321,30 @@
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -40267,173 +18704,76 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -40731,7 +40068,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute ri (
-- &_tao_call,
-- _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 */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
- (_tao_out << name) &&
- (_tao_out << version) &&
- (_tao_out << type) &&
- (_tao_out << mode) &&
- (_tao_out << get_exceptions) &&
- (_tao_out << put_exceptions)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -40810,7 +40147,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_AttributeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -40876,16 +40213,16 @@
return _tao_safe_retval._retn ();
}
-IR::OperationDef_ptr IR::_TAO_ValueDef_Remote_Proxy_Impl::create_operation (
-+IR_OperationDef_ptr _TAO_InterfaceDef_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,
@@ -49128,7 +21362,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -40441,8 +18781,8 @@
+@@ -40893,8 +40230,8 @@
))
{
@@ -49139,365 +21373,176 @@
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -40458,60 +18798,22 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -40922,7 +40259,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- name,
-- version,
-- result,
-- mode,
-- params,
-- exceptions,
-- contexts,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
- (_tao_out << name) &&
- (_tao_out << version) &&
- (_tao_out << result) &&
-@@ -40519,101 +18821,41 @@
- (_tao_out << params) &&
- (_tao_out << exceptions) &&
- (_tao_out << contexts)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -41003,7 +40340,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
- return _tao_safe_retval._retn ();
- }
-
-@@ -40627,32 +18869,32 @@
++ IR_OperationDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -41079,37 +40416,37 @@
// Remote & Base Proxy Broker Implementation
//
-IR::_TAO_ValueDef_Proxy_Broker::_TAO_ValueDef_Proxy_Broker (void)
-+_TAO_InterfaceDef_Proxy_Broker::_TAO_InterfaceDef_Proxy_Broker (void)
++_TAO_ValueDef_Proxy_Broker::_TAO_ValueDef_Proxy_Broker (void)
{
}
-IR::_TAO_ValueDef_Proxy_Broker::~_TAO_ValueDef_Proxy_Broker (void)
-+_TAO_InterfaceDef_Proxy_Broker::~_TAO_InterfaceDef_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_InterfaceDef_Remote_Proxy_Broker *the_TAO_InterfaceDef_Remote_Proxy_Broker (void)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_ValueDef_Remote_Proxy_Broker *
+-IR::_TAO_ValueDef_Remote_Proxy_Broker::the_TAO_ValueDef_Remote_Proxy_Broker (void)
++_TAO_ValueDef_Remote_Proxy_Broker *
++_TAO_ValueDef_Remote_Proxy_Broker::the_TAO_ValueDef_Remote_Proxy_Broker (void)
{
- static ::IR::_TAO_ValueDef_Remote_Proxy_Broker remote_proxy_broker;
-+ static ::_TAO_InterfaceDef_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_InterfaceDef_Remote_Proxy_Broker::_TAO_InterfaceDef_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_InterfaceDef_Remote_Proxy_Broker::~_TAO_InterfaceDef_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_InterfaceDef_Proxy_Impl&
-+_TAO_InterfaceDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_InterfaceDef *object,
++_TAO_ValueDef_Proxy_Impl&
++_TAO_ValueDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_ValueDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -40668,114 +18910,115 @@
+@@ -41125,113 +40462,111 @@
// default constructor
-IR::ValueDef::ValueDef (int collocated)
-+IR_InterfaceDef::IR_InterfaceDef (int collocated)
++IR_ValueDef::IR_ValueDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_ValueDef_setup_collocation (collocated);
}
// destructor
-IR::ValueDef::~ValueDef (void)
-+IR_InterfaceDef::~IR_InterfaceDef (void)
++IR_ValueDef::~IR_ValueDef (void)
{}
void
--IR::ValueDef::_tao_setup_collocation (int collocated)
-+IR_InterfaceDef::_tao_setup_collocation (int collocated)
+-IR::ValueDef::IR_ValueDef_setup_collocation (int collocated)
++IR_ValueDef::IR_ValueDef_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_ValueDef_Proxy_Broker_ =
+ this->the_TAO_ValueDef_Proxy_Broker_ =
- ::IR__TAO_ValueDef_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_InterfaceDef_Proxy_Broker_ =
-+ _TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_ValueDef_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_ValueDef_Proxy_Broker_ =
+ this->the_TAO_ValueDef_Proxy_Broker_ =
- ::IR::_TAO_ValueDef_Remote_Proxy_Broker::the_TAO_ValueDef_Remote_Proxy_Broker ();
-+ 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);
++ _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);
+ this->IR_Container_setup_collocation (collocated);
+-
+ this->IR_Contained_setup_collocation (collocated);
+-
+ this->IR_IDLType_setup_collocation (collocated);
}
-void IR::ValueDef::_tao_any_destructor (void *x)
-+void IR_InterfaceDef::_tao_any_destructor (void *x)
++void IR_ValueDef::_tao_any_destructor (void *x)
{
- ValueDef *tmp = ACE_static_cast (ValueDef*,x);
-+ IR_InterfaceDef *tmp = ACE_static_cast (IR_InterfaceDef*,x);
++ IR_ValueDef *tmp = ACE_static_cast (IR_ValueDef*,x);
CORBA::release (tmp);
}
-IR::ValueDef_ptr IR::ValueDef::_narrow (
-+IR_InterfaceDef_ptr IR_InterfaceDef::_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_InterfaceDef::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ValueDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (ValueDef::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/InterfaceDef:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_InterfaceDef::_nil ());
++ ACE_CHECK_RETURN (IR_ValueDef::_nil ());
if (is_a == 0)
- return ValueDef::_nil ();
-+ return IR_InterfaceDef::_nil ();
++ return IR_ValueDef::_nil ();
}
- return ValueDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_InterfaceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_ValueDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::ValueDef_ptr IR::ValueDef::_unchecked_narrow (
-+IR_InterfaceDef_ptr IR_InterfaceDef::_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_InterfaceDef::_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_InterfaceDef_ptr default_proxy = IR_InterfaceDef::_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_InterfaceDef_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_InterfaceDef (
++ ::IR_ValueDef (
stub,
1,
obj->_servant ()),
- ValueDef::_nil ());
-+ IR_InterfaceDef::_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_InterfaceDef (stub, 0, obj->_servant ()), IR_InterfaceDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_ValueDef (stub, 0, obj->_servant ()), IR_ValueDef::_nil ());
return default_proxy;
}
else
@@ -49505,14 +21550,14 @@
ACE_reinterpret_cast
(
- ValueDef_ptr,
-+ IR_InterfaceDef_ptr,
++ IR_ValueDef_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &ValueDef::_narrow
-+ &IR_InterfaceDef::_narrow
++ &IR_ValueDef::_narrow
)
)
);
@@ -49520,8 +21565,8 @@
-IR::ValueDef_ptr
-IR::ValueDef::_duplicate (ValueDef_ptr obj)
-+IR_InterfaceDef_ptr
-+IR_InterfaceDef::_duplicate (IR_InterfaceDef_ptr obj)
++IR_ValueDef_ptr
++IR_ValueDef::_duplicate (IR_ValueDef_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -49529,26 +21574,22 @@
}
-CORBA::Boolean IR::ValueDef::_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)
++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/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")) ||
-@@ -40786,166 +19029,76 @@
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ValueDef:1.0")) ||
+@@ -41245,58 +40580,58 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::ValueDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_InterfaceDef::_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_InterfaceDef::_narrow))
++ &IR_ValueDef::_narrow))
retv = ACE_reinterpret_cast (void*, this);
else if (type == ACE_reinterpret_cast
(ptr_arith_t,
@@ -49599,312 +21640,182 @@
retv = ACE_reinterpret_cast
(
void *,
-- ACE_static_cast
-- (
+ 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;
--}
--
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -41309,12 +40644,12 @@
+ return retv;
+ }
+
-const char* IR::ValueDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/ValueDef:1.0";
--}
--
++const char* IR_ValueDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/ValueDef:1.0";
+ }
+
-IR::InterfaceDefSeq * IR::ValueDef::supported_interfaces (
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).supported_interfaces (
-- this,
-- ACE_TRY_ENV
-- );
--}
--
++IR_InterfaceDefSeq * IR_ValueDef::supported_interfaces (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -41331,8 +40666,8 @@
+ );
+ }
+
-void IR::ValueDef::supported_interfaces (
- const IR::InterfaceDefSeq & supported_interfaces,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).supported_interfaces (
-- this,
-- supported_interfaces,
-- ACE_TRY_ENV
-- );
--}
--
++void IR_ValueDef::supported_interfaces (
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -41350,7 +40685,7 @@
+ );
+ }
+
-IR::InitializerSeq * IR::ValueDef::initializers (
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).initializers (
-- this,
-- ACE_TRY_ENV
-- );
--}
--
++IR_InitializerSeq * IR_ValueDef::initializers (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -41367,8 +40702,8 @@
+ );
+ }
+
-void IR::ValueDef::initializers (
- const IR::InitializerSeq & initializers,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).initializers (
-- this,
-- initializers,
-- ACE_TRY_ENV
-- );
--}
--
++void IR_ValueDef::initializers (
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -41386,7 +40721,7 @@
+ );
+ }
+
-IR::ValueDef_ptr IR::ValueDef::base_value (
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).base_value (
-- this,
-- ACE_TRY_ENV
-- );
-+ 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;
++IR_ValueDef_ptr IR_ValueDef::base_value (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -41403,8 +40738,8 @@
+ );
}
-void IR::ValueDef::base_value (
- IR::ValueDef_ptr base_value,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+const char* IR_InterfaceDef::_interface_repository_id (void) const
- {
--
-- this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).base_value (
-- this,
-- base_value,
-- ACE_TRY_ENV
-- );
-+ return "IDL:omg.org/IR/InterfaceDef:1.0";
++void IR_ValueDef::base_value (
++ IR_ValueDef_ptr base_value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -41422,7 +40757,7 @@
+ );
}
-IR::ValueDefSeq * IR::ValueDef::abstract_base_values (
-+IR_InterfaceDefSeq * IR_InterfaceDef::base_interfaces (
++IR_ValueDefSeq * IR_ValueDef::abstract_base_values (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -40953,14 +19106,14 @@
- ))
- {
-
-- return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).abstract_base_values (
-+ return this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).base_interfaces (
- this,
- ACE_TRY_ENV
+@@ -41439,8 +40774,8 @@
);
}
-void IR::ValueDef::abstract_base_values (
- const IR::ValueDefSeq & abstract_base_values,
-+void IR_InterfaceDef::base_interfaces (
-+ const IR_InterfaceDefSeq & base_interfaces,
++void IR_ValueDef::abstract_base_values (
++ const IR_ValueDefSeq & abstract_base_values,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -40968,14 +19121,14 @@
- ))
- {
-
-- this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).abstract_base_values (
-+ this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).base_interfaces (
- this,
-- abstract_base_values,
-+ base_interfaces,
- ACE_TRY_ENV
+@@ -41458,7 +40793,7 @@
);
}
-CORBA::Boolean IR::ValueDef::is_abstract (
-+CORBA::Boolean IR_InterfaceDef::is_abstract (
++CORBA::Boolean IR_ValueDef::is_abstract (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -40983,13 +19136,13 @@
- ))
- {
-
-- return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_abstract (
-+ return this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_abstract (
- this,
- ACE_TRY_ENV
+@@ -41475,7 +40810,7 @@
);
}
-void IR::ValueDef::is_abstract (
-+void IR_InterfaceDef::is_abstract (
++void IR_ValueDef::is_abstract (
CORBA::Boolean is_abstract,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -40998,59 +19151,14 @@
- ))
- {
-
-- this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_abstract (
-+ this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_abstract (
- this,
- is_abstract,
- ACE_TRY_ENV
+@@ -41494,7 +40829,7 @@
);
}
-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
-- );
--}
--
++CORBA::Boolean IR_ValueDef::is_custom (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -41511,7 +40846,7 @@
+ );
+ }
+
-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
-- );
--}
--
++void IR_ValueDef::is_custom (
+ CORBA::Boolean is_custom,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -41530,7 +40865,7 @@
+ );
+ }
+
-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::Boolean IR_InterfaceDef::is_local (
++CORBA::Boolean IR_ValueDef::is_truncatable (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -41058,15 +19166,14 @@
- ))
- {
-
-- this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_truncatable (
-+ return this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_local (
- this,
-- is_truncatable,
- ACE_TRY_ENV
+@@ -41547,7 +40882,7 @@
+ );
+ }
+
+-void IR::ValueDef::is_truncatable (
++void IR_ValueDef::is_truncatable (
+ CORBA::Boolean is_truncatable,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -41566,7 +40901,7 @@
);
}
-CORBA::Boolean IR::ValueDef::is_a (
-- const char * id,
-+void IR_InterfaceDef::is_local (
-+ CORBA::Boolean is_local,
++CORBA::Boolean IR_ValueDef::is_a (
+ const char * id,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
-@@ -41074,19 +19181,15 @@
- ))
- {
-
-- return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_a (
-+ this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_local (
- this,
-- id,
-+ is_local,
- ACE_TRY_ENV
+@@ -41585,11 +40920,11 @@
);
}
-IR::ValueMemberDef_ptr IR::ValueDef::create_value_member (
-- const char * id,
-- const char * name,
-- const char * version,
++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::Boolean IR_InterfaceDef::is_a (
-+ const char * interface_id,
++ IR_IDLType_ptr type,
+ CORBA::Visibility access,
CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
-@@ -41094,25 +19197,21 @@
- ))
- {
-
-- return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_value_member (
-+ return this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_a (
- this,
-- id,
-- name,
-- version,
-- type,
-- access,
-+ interface_id,
- ACE_TRY_ENV
+@@ -41612,14 +40947,14 @@
);
}
-IR::AttributeDef_ptr IR::ValueDef::create_attribute (
-+IR_AttributeDef_ptr IR_InterfaceDef::create_attribute (
++IR_AttributeDef_ptr IR_ValueDef::create_attribute (
const char * id,
const char * name,
const char * version,
@@ -49919,21 +21830,12 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -41120,7 +19219,7 @@
- ))
- {
-
-- return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_attribute (
-+ return this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_attribute (
- this,
- id,
- name,
-@@ -41133,15 +19232,15 @@
+@@ -41643,15 +40978,15 @@
);
}
-IR::OperationDef_ptr IR::ValueDef::create_operation (
-+IR_OperationDef_ptr IR_InterfaceDef::create_operation (
++IR_OperationDef_ptr IR_ValueDef::create_operation (
const char * id,
const char * name,
const char * version,
@@ -49950,5181 +21852,1543 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -41149,7 +19248,7 @@
- ))
- {
-
-- return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_operation (
-+ return this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_operation (
- this,
- id,
- name,
-@@ -41163,1196 +19262,493 @@
+@@ -41676,9 +41011,8 @@
);
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -41687,7 +41021,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -41699,7 +41033,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -41712,7 +41046,7 @@
+
+
+ CORBA::Any *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -41728,16 +41062,16 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- const IR::InterfaceDefSeq & supported_interfaces,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- supported_interfaces_ (supported_interfaces)
--{}
--
--Dynamic::ParameterList *
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -41745,7 +41079,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_supported_interfaces = parameter_list->length ();
-- parameter_list->length (length_supported_interfaces + 1);
-- (*parameter_list)[length_supported_interfaces].argument <<= this->supported_interfaces_;
--
-- (*parameter_list)[length_supported_interfaces].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -41765,7 +41099,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -41778,7 +41112,7 @@
+
+
+ CORBA::Any *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -41790,7 +41124,7 @@
+ return result_any;
+ }
+
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::TAO_ClientRequestInfo_IR_ValueDef_initializers_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::TAO_ClientRequestInfo_IR_ValueDef_initializers_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -41799,7 +41133,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -41811,7 +41145,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -41824,7 +41158,7 @@
+
+
+ CORBA::Any *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -41840,16 +41174,16 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::TAO_ClientRequestInfo_IR_ValueDef_initializers_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- const IR::InitializerSeq & initializers,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- initializers_ (initializers)
--{}
--
--Dynamic::ParameterList *
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -41857,7 +41191,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_initializers = parameter_list->length ();
-- parameter_list->length (length_initializers + 1);
-- (*parameter_list)[length_initializers].argument <<= this->initializers_;
--
-- (*parameter_list)[length_initializers].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -41877,7 +41211,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -41890,7 +41224,7 @@
+
+
+ CORBA::Any *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -41902,7 +41236,7 @@
+ return result_any;
+ }
+
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::TAO_ClientRequestInfo_IR_ValueDef_base_value_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::TAO_ClientRequestInfo_IR_ValueDef_base_value_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -41911,7 +41245,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -41923,7 +41257,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -41936,7 +41270,7 @@
+
+
+ CORBA::Any *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -41952,16 +41286,16 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::TAO_ClientRequestInfo_IR_ValueDef_base_value_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- IR::ValueDef_ptr base_value,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- base_value_ (base_value)
--{}
--
--Dynamic::ParameterList *
++ IR_ValueDef_ptr base_value,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -41969,7 +41303,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_base_value = parameter_list->length ();
-- parameter_list->length (length_base_value + 1);
-- (*parameter_list)[length_base_value].argument <<= this->base_value_;
--
-- (*parameter_list)[length_base_value].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -41989,7 +41323,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -42002,7 +41336,7 @@
+
+
+ CORBA::Any *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
--
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -42014,7 +41348,7 @@
+ return result_any;
+ }
+
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -42023,7 +41357,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -42035,7 +41369,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -42048,7 +41382,7 @@
+
+
+ CORBA::Any *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -42064,16 +41398,16 @@
+ }
+
+ void
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::result (IR::ValueDefSeq * result)
-+static const CORBA::Long _oc_IR_InterfaceDef[] =
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::result (IR_ValueDefSeq * result)
{
-- // update the result
-- this->_result = 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- const IR::ValueDefSeq & abstract_base_values,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- abstract_base_values_ (abstract_base_values)
--{}
-+ 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
-+};
-+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
++ const IR_ValueDefSeq & abstract_base_values,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -42081,7 +41415,7 @@
+ {}
--Dynamic::ParameterList *
+ Dynamic::ParameterList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+static const CORBA::Long _oc_IR_InterfaceDescription[] =
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_abstract_base_values = parameter_list->length ();
-- parameter_list->length (length_abstract_base_values + 1);
-- (*parameter_list)[length_abstract_base_values].argument <<= this->abstract_base_values_;
--
-- (*parameter_list)[length_abstract_base_values].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+ 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 = InterfaceDescription
-+ 10, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
+ // Generate the argument list on demand.
+@@ -42101,7 +41435,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -42114,7 +41448,7 @@
-+ 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
--CORBA::Any *
+ CORBA::Any *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -42126,7 +41460,7 @@
+ return result_any;
+ }
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
-+ 11, ACE_NTOHL (0x6f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e730000), // name = operations
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = OpDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 1896, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = OperationDescription
-+ 9, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-
--Dynamic::ParameterList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -42135,7 +41469,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
--Dynamic::ExceptionList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -42147,7 +41481,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
-
--CORBA::Any *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -42160,7 +41494,7 @@
+
+
+ CORBA::Any *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-- return safe_result_any._retn ();
--}
-+ 7, ACE_NTOHL (0x72657375), ACE_NTOHL (0x6c740000), // name = result
-+ CORBA::tk_TypeCode,
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -42176,13 +41510,13 @@
+ }
--void
+ void
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::result (CORBA::Boolean result)
--{
-- // update the result
-- this->_result = result;
--}
-+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-+ CORBA::tk_enum, // typecode kind
-+ 100, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/OperationMode:1.0
-+ 14, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e4d6f64), ACE_NTOHL (0x65000000), // name = OperationMode
-+ 2, // member count
-+ 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
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const CORBA::Boolean & is_abstract,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- is_abstract_ (is_abstract)
--{}
-+ 9, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x65787473), ACE_NTOHL (0x0), // name = contexts
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = ContextIdSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 160, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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
-+ 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_string,
-+ 0U, // string length
-
--Dynamic::ParameterList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const CORBA::Boolean & is_abstract,
+@@ -42193,7 +41527,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_is_abstract = parameter_list->length ();
-- parameter_list->length (length_is_abstract + 1);
-- (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
-- (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -42212,7 +41546,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ 0U,
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -42225,7 +41559,7 @@
--CORBA::Any *
+ CORBA::Any *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
-+ 11, ACE_NTOHL (0x70617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72730000), // name = parameters
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = ParDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 404, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = ParameterDescription
-+ 4, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -42237,7 +41571,7 @@
+ return result_any;
+ }
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
-
--Dynamic::ParameterList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -42246,7 +41580,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+ 9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0), // name = type_def
-+ CORBA::tk_objref, // typecode kind
-+ 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 = IR_IDLType
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -42258,7 +41592,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-+ CORBA::tk_enum, // typecode kind
-+ 116, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x6172616d), ACE_NTOHL (0x65746572), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ParameterMode:1.0
-+ 14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000), // name = ParameterMode
-+ 3, // member count
-+ 9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0), // name = PARAM_IN
-+ 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
-
-
--CORBA::Any *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -42271,7 +41605,7 @@
+
+
+ CORBA::Any *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-- return safe_result_any._retn ();
--}
-+ 0U,
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -42287,13 +41621,13 @@
+ }
--void
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const CORBA::Boolean & is_custom,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- is_custom_ (is_custom)
--{}
-+ 11, ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = exceptions
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = ExcDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 456, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = ExceptionDescription
-+ 5, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-
--Dynamic::ParameterList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const CORBA::Boolean & is_custom,
+@@ -42304,7 +41638,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_is_custom = parameter_list->length ();
-- parameter_list->length (length_is_custom + 1);
-- (*parameter_list)[length_is_custom].argument <<= CORBA::Any::from_boolean (this->is_custom_);
-- (*parameter_list)[length_is_custom].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
--Dynamic::ExceptionList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -42323,7 +41657,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
-
--CORBA::Any *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -42336,7 +41670,7 @@
+
+
+ CORBA::Any *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -42348,7 +41682,7 @@
+ return result_any;
+ }
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
-
--Dynamic::ParameterList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -42357,7 +41691,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+ 0U,
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -42369,7 +41703,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -42382,7 +41716,7 @@
--CORBA::Any *
+ CORBA::Any *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-- return safe_result_any._retn ();
--}
-+ 0U,
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -42398,13 +41732,13 @@
+ }
--void
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const CORBA::Boolean & is_truncatable,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- is_truncatable_ (is_truncatable)
--{}
-+ 11, ACE_NTOHL (0x61747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65730000), // name = attributes
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = AttrDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 1708, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = AttributeDescription
-+ 8, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-
--Dynamic::ParameterList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const CORBA::Boolean & is_truncatable,
+@@ -42415,7 +41749,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_is_truncatable = parameter_list->length ();
-- parameter_list->length (length_is_truncatable + 1);
-- (*parameter_list)[length_is_truncatable].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
-- (*parameter_list)[length_is_truncatable].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
--Dynamic::ExceptionList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -42434,7 +41768,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
-
--CORBA::Any *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -42447,7 +41781,7 @@
+
+
+ CORBA::Any *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
--}
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -42459,7 +41793,7 @@
+ return result_any;
+ }
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::TAO_ClientRequestInfo_IR_ValueDef_is_a (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id)
--{}
-+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-+ CORBA::tk_enum, // typecode kind
-+ 104, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/AttributeMode:1.0
-+ 14, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x654d6f64), ACE_NTOHL (0x65000000), // name = AttributeMode
-+ 2, // member count
-+ 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
-
--Dynamic::ParameterList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::TAO_ClientRequestInfo_IR_ValueDef_is_a (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * id,
+@@ -42470,7 +41804,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+ 15, ACE_NTOHL (0x6765745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = get_exceptions
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = ExcDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 456, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = ExceptionDescription
-+ 5, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-
--Dynamic::ExceptionList *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -42489,7 +41823,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = 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
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
--CORBA::Any *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -42502,7 +41836,7 @@
+
+
+ CORBA::Any *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-- return safe_result_any._retn ();
--}
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
-
--void
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -42518,19 +41852,19 @@
+ }
+
+ void
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::result (CORBA::Boolean result)
--{
-- // update the result
-- this->_result = result;
--}
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::result (CORBA::Boolean result)
+ {
+ // update the result
+ this->_result = result;
+ }
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::TAO_ClientRequestInfo_IR_ValueDef_create_value_member (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::TAO_ClientRequestInfo_IR_ValueDef_create_value_member (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * id,
+ const char * name,
+ const char * version,
- IR::IDLType_ptr type,
-- const CORBA::Visibility & access,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- type_ (type),
-- access_ (access)
--{}
-
--Dynamic::ParameterList *
++ IR_IDLType_ptr type,
+ const CORBA::Visibility & access,
+ CORBA::Environment &
+ )
+@@ -42543,7 +41877,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_type = parameter_list->length ();
-- parameter_list->length (length_type + 1);
-- (*parameter_list)[length_type].argument <<= this->type_;
--
-- (*parameter_list)[length_type].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_access = parameter_list->length ();
-- parameter_list->length (length_access + 1);
-- (*parameter_list)[length_access].argument <<= access_;
-- (*parameter_list)[length_access].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+ 0U,
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -42583,7 +41917,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-
-+ 15, ACE_NTOHL (0x7075745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = put_exceptions
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = ExcDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 456, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = ExceptionDescription
-+ 5, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-
--CORBA::Any *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -42596,7 +41930,7 @@
+
+
+ CORBA::Any *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
--void
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -42612,22 +41946,22 @@
+ }
+
+ void
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::result (IR::ValueMemberDef_ptr result)
--{
-- // update the result
-- this->_result = result;
--}
-+ 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::result (IR_ValueMemberDef_ptr result)
+ {
+ // update the result
+ this->_result = result;
+ }
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::TAO_ClientRequestInfo_IR_ValueDef_create_attribute (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::TAO_ClientRequestInfo_IR_ValueDef_create_attribute (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- type_ (type),
-- mode_ (mode),
-- get_exceptions_ (get_exceptions),
-- put_exceptions_ (put_exceptions)
--{}
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
-
--Dynamic::ParameterList *
++ IR_IDLType_ptr type,
++ IR_AttributeMode & mode,
++ const IR_ExceptionDefSeq & get_exceptions,
++ const IR_ExceptionDefSeq & put_exceptions,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -42641,7 +41975,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_type = parameter_list->length ();
-- parameter_list->length (length_type + 1);
-- (*parameter_list)[length_type].argument <<= this->type_;
--
-- (*parameter_list)[length_type].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_mode = parameter_list->length ();
-- parameter_list->length (length_mode + 1);
-- (*parameter_list)[length_mode].argument <<= this->mode_;
--
-- (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_get_exceptions = parameter_list->length ();
-- parameter_list->length (length_get_exceptions + 1);
-- (*parameter_list)[length_get_exceptions].argument <<= this->get_exceptions_;
--
-- (*parameter_list)[length_get_exceptions].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_put_exceptions = parameter_list->length ();
-- parameter_list->length (length_put_exceptions + 1);
-- (*parameter_list)[length_put_exceptions].argument <<= this->put_exceptions_;
--
-- (*parameter_list)[length_put_exceptions].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -42694,7 +42028,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -42707,7 +42041,7 @@
-+ 0U,
--CORBA::Any *
+ CORBA::Any *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -42723,23 +42057,23 @@
+ }
--void
+ void
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::result (IR::AttributeDef_ptr result)
--{
-- // update the result
-- this->_result = result;
--}
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::result (IR_AttributeDef_ptr result)
+ {
+ // update the result
+ this->_result = result;
+ }
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::TAO_ClientRequestInfo_IR_ValueDef_create_operation (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::TAO_ClientRequestInfo_IR_ValueDef_create_operation (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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 &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- result_ (result),
-- mode_ (mode),
-- params_ (params),
-- exceptions_ (exceptions),
-- contexts_ (contexts)
--{}
-+ 0U,
-
--Dynamic::ParameterList *
++ IR_IDLType_ptr result,
++ IR_OperationMode & mode,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -42754,7 +42088,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_result = parameter_list->length ();
-- parameter_list->length (length_result + 1);
-- (*parameter_list)[length_result].argument <<= this->result_;
--
-- (*parameter_list)[length_result].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_mode = parameter_list->length ();
-- parameter_list->length (length_mode + 1);
-- (*parameter_list)[length_mode].argument <<= this->mode_;
--
-- (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_params = parameter_list->length ();
-- parameter_list->length (length_params + 1);
-- (*parameter_list)[length_params].argument <<= this->params_;
--
-- (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_exceptions = parameter_list->length ();
-- parameter_list->length (length_exceptions + 1);
-- (*parameter_list)[length_exceptions].argument <<= this->exceptions_;
--
-- (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_contexts = parameter_list->length ();
-- parameter_list->length (length_contexts + 1);
-- (*parameter_list)[length_contexts].argument <<= this->contexts_;
--
-- (*parameter_list)[length_contexts].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -42813,7 +42147,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ 16, ACE_NTOHL (0x62617365), ACE_NTOHL (0x5f696e74), ACE_NTOHL (0x65726661), ACE_NTOHL (0x63657300), // name = base_interfaces
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryIdSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 84, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
-+ 0U,
-
--CORBA::Any *
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -42826,7 +42160,7 @@
+
+
+ CORBA::Any *
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -42842,24 +42176,26 @@
+ }
--void
+ void
-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::result (IR::OperationDef_ptr result)
--{
-- // update the result
-- this->_result = result;
--}
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
-+
-+ 12, ACE_NTOHL (0x69735f61), ACE_NTOHL (0x62737472), ACE_NTOHL (0x61637400), // name = is_abstract
-+ CORBA::tk_boolean,
-+
-+ 9, ACE_NTOHL (0x69735f6c), ACE_NTOHL (0x6f63616c), ACE_NTOHL (0x0), // name = is_local
-+ CORBA::tk_boolean,
++IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::result (IR_OperationDef_ptr result)
+ {
+ // update the result
+ this->_result = result;
+ }
--#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
+ #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_InterfaceDescription (CORBA::tk_struct, sizeof (_oc_IR_InterfaceDescription), (char *) &_oc_IR_InterfaceDescription, 0, sizeof (IR_InterfaceDescription));
++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_DEFINE (CORBA::TypeCode_ptr, _tc_InterfaceDescription, &_tc_TAO_tc_IR_InterfaceDescription)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueDef, &_tc_TAO_tc_IR_ValueDef)
TAO_NAMESPACE_END
--static const CORBA::Long _oc_IR_ValueDescription[] =
-+
-+void IR_InterfaceDescription::_tao_any_destructor (void *x)
-+{
-+ IR_InterfaceDescription *tmp = ACE_static_cast (IR_InterfaceDescription*,x);
-+ delete tmp;
-+}
+
-+static const CORBA::Long _oc_IR_ValueMember[] =
+ 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 = ValueDescription
-- 15, // member count
-+ 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 = ValueMember
-+ 7, // member count
- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
- CORBA::tk_alias, // typecode kind for typedefs
- 64, // encapsulation length
-@@ -42371,12 +19767,6 @@
- CORBA::tk_string,
- 0U, // string length
-
-- 12, ACE_NTOHL (0x69735f61), ACE_NTOHL (0x62737472), ACE_NTOHL (0x61637400), // name = is_abstract
-- CORBA::tk_boolean,
--
-- 10, ACE_NTOHL (0x69735f63), ACE_NTOHL (0x7573746f), ACE_NTOHL (0x6d000000), // name = is_custom
-- CORBA::tk_boolean,
--
- 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
-@@ -42395,612 +19785,1391 @@
- CORBA::tk_string,
- 0U, // string length
-
-- 11, ACE_NTOHL (0x6f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e730000), // name = operations
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
-+
-+ 9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0), // name = type_def
-+ CORBA::tk_objref, // typecode kind
-+ 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 = IR_IDLType
-+
-+ 7, ACE_NTOHL (0x61636365), ACE_NTOHL (0x73730000), // name = access
- CORBA::tk_alias, // typecode kind for typedefs
-- 1972, // encapsulation length
-+ 64, // 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 = OpDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 1896, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = OperationDescription
-- 9, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
-+ 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,
-
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
-+};
-+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
-
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
-+void IR_ValueMember::_tao_any_destructor (void *x)
-+{
-+ IR_ValueMember *tmp = ACE_static_cast (IR_ValueMember*,x);
-+ delete tmp;
-+}
-+
-+
-+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-+
-+ 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 /* !TAO_USE_SEQUENCE_TEMPLATES */
-+
-+// *************************************************************
-+// IR_ValueMemberSeq
-+// *************************************************************
-+
-+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 */
-+ (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 */
-+ (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 */
-+ (seq)
-+{}
-+IR_ValueMemberSeq::~IR_ValueMemberSeq (void) // dtor
-+{}
-+void IR_ValueMemberSeq::_tao_any_destructor (void *x)
-+{
-+ IR_ValueMemberSeq *tmp = ACE_static_cast (IR_ValueMemberSeq*,x);
-+ delete tmp;
-+}
-+
-+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 = ValueMemberSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 592, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = ValueMember
-+ 7, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-+
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
-- 7, ACE_NTOHL (0x72657375), ACE_NTOHL (0x6c740000), // name = result
-- CORBA::tk_TypeCode,
-+ 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
-- 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-- CORBA::tk_enum, // typecode kind
-- 100, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/OperationMode:1.0
-- 14, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e4d6f64), ACE_NTOHL (0x65000000), // name = OperationMode
-- 2, // member count
-- 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
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
-
-- 9, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x65787473), ACE_NTOHL (0x0), // name = contexts
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = ContextIdSeq
-- CORBA::tk_sequence, // typecode kind
-- 160, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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
-- 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_string,
-- 0U, // string length
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
-
-+ 9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0), // name = type_def
-+ CORBA::tk_objref, // typecode kind
-+ 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 = IR_IDLType
-
-- 0U,
-+ 7, ACE_NTOHL (0x61636365), ACE_NTOHL (0x73730000), // name = access
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-
-
-- 11, ACE_NTOHL (0x70617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72730000), // name = parameters
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = ParDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 404, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = ParameterDescription
-- 4, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
-
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
-+ 0U,
-
-- 9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0), // name = type_def
-- CORBA::tk_objref, // typecode kind
-- 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
+@@ -43030,7 +42366,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
-+};
-+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)
-+TAO_NAMESPACE_END
-
-- 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-- CORBA::tk_enum, // typecode kind
-- 116, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x6172616d), ACE_NTOHL (0x65746572), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ParameterMode:1.0
-- 14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000), // name = ParameterMode
-- 3, // member count
-- 9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0), // name = PARAM_IN
-- 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
-+///////////////////////////////////////////////////////////////////////
-+// Base & Remote Proxy Implementation.
-+//
-
-+_TAO_ValueMemberDef_Proxy_Impl::_TAO_ValueMemberDef_Proxy_Impl (void)
-+{}
-
-- 0U,
-+_TAO_ValueMemberDef_Remote_Proxy_Impl::_TAO_ValueMemberDef_Remote_Proxy_Impl (void)
-+{}
-
-+// Remote Implementation of the IDL interface methods
-
-- 11, ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = exceptions
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = ExcDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 456, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = ExceptionDescription
-- 5, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
-+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 = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
-+
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_get_type",
-+ 9,
-+ 0,
-+ istub->orb_core ()
-+ );
-
-- 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
-+ 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;
-+ }
-+ return _tao_safe_retval._retn ();
-+}
-
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
-+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 = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
-+
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_get_type_def",
-+ 13,
-+ 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;
-+ }
-
-+ return _tao_safe_retval._retn ();
-+}
-
-- 0U,
-+void _TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
-+ CORBA_Object *_collocated_tao_target_,
-+ 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",
-+ 13,
-+ 1,
-+ istub->orb_core ()
-+ );
-
-+ for (;;)
-+ {
-+ _tao_call.start (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 << type_def)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
-+ {
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
-+ }
-+
-+ break;
-+ }
-+}
-
-- 0U,
-+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 = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-+
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_get_access",
-+ 11,
-+ 0,
-+ istub->orb_core ()
-+ );
-
-- 11, ACE_NTOHL (0x61747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65730000), // name = attributes
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = AttrDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 1708, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = AttributeDescription
-- 8, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
-+ );
-+ ACE_CHECK_RETURN (_tao_retval);
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ 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),
-+ _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
-+ );
-+ }
-+ break;
-+ }
-
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
-+ return _tao_retval;
-+}
-
-- 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
-+void _TAO_ValueMemberDef_Remote_Proxy_Impl::access (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Visibility access,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW (CORBA::INTERNAL ());
-
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
-+
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_set_access",
-+ 11,
-+ 1,
-+ istub->orb_core ()
-+ );
-
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
-+ for (;;)
-+ {
-+ _tao_call.start (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 << access)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
-+ {
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
-+ }
-+
-+ break;
-+ }
-+}
-
-- 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-- CORBA::tk_enum, // typecode kind
-- 104, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/AttributeMode:1.0
-- 14, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x654d6f64), ACE_NTOHL (0x65000000), // name = AttributeMode
-- 2, // member count
-- 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
-
-- 15, ACE_NTOHL (0x6765745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = get_exceptions
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = ExcDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 456, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = ExceptionDescription
-- 5, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
-+//
-+// End Base & Remote Proxy Implemeentation.
-+///////////////////////////////////////////////////////////////////////
-
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
-+///////////////////////////////////////////////////////////////////////
-+// Remote & Base Proxy Broker Implementation
-+//
-
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
-+_TAO_ValueMemberDef_Proxy_Broker::_TAO_ValueMemberDef_Proxy_Broker (void)
-+{
-+}
-
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
-+_TAO_ValueMemberDef_Proxy_Broker::~_TAO_ValueMemberDef_Proxy_Broker (void)
-+{
-+}
-
-+// Factory function Implementation.
-+_TAO_ValueMemberDef_Remote_Proxy_Broker *the_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
-+{
-+ static ::_TAO_ValueMemberDef_Remote_Proxy_Broker remote_proxy_broker;
-+ return &remote_proxy_broker;
-+}
-
-- 0U,
-+_TAO_ValueMemberDef_Remote_Proxy_Broker::_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
-+{
-+}
-
-+_TAO_ValueMemberDef_Remote_Proxy_Broker::~_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
-+{
-+}
-
-- 15, ACE_NTOHL (0x7075745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = put_exceptions
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = ExcDescriptionSeq
-- CORBA::tk_sequence, // typecode kind
-- 456, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = ExceptionDescription
-- 5, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
-+_TAO_ValueMemberDef_Proxy_Impl&
-+_TAO_ValueMemberDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_ValueMemberDef *object,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ ACE_UNUSED_ARG (object);
-+ ACE_UNUSED_ARG (ACE_TRY_ENV);
-+ return remote_proxy_impl_;
-+}
-
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
-+//
-+// End Remote & Base Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
-
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
-+// default constructor
-+IR_ValueMemberDef::IR_ValueMemberDef (int collocated)
-+{
-+ this->_tao_setup_collocation (collocated);
-+}
-
-+// destructor
-+IR_ValueMemberDef::~IR_ValueMemberDef (void)
-+{}
-
-- 0U,
-+void
-+IR_ValueMemberDef::_tao_setup_collocation (int collocated)
-+{
-+ 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);
-+
-+}
-
-+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 ();
-+ if (! obj->_is_local ())
-+ {
-+ 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);
-+}
-
-- 0U,
-+IR_ValueMemberDef_ptr IR_ValueMemberDef::_unchecked_narrow (
-+ CORBA::Object_ptr obj,
-+ CORBA::Environment &
-+ )
-+{
-+ 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 ();
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
-+ 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
-+ )
-+ )
-+ );
-+}
-
-- 8, ACE_NTOHL (0x6d656d62), ACE_NTOHL (0x65727300), // name = members
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = ValueMemberSeq
-- CORBA::tk_sequence, // typecode kind
-- 592, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = ValueMember
-- 7, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
-+IR_ValueMemberDef_ptr
-+IR_ValueMemberDef::_duplicate (IR_ValueMemberDef_ptr obj)
-+{
-+ if (!CORBA::is_nil (obj))
-+ obj->_add_ref ();
-+ return obj;
-+}
-
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
-+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);
-+}
-
-- 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
-+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;
-+}
-
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
-+const char* IR_ValueMemberDef::_interface_repository_id (void) const
-+{
-+ return "IDL:omg.org/IR/ValueMemberDef:1.0";
-+}
-+
-+CORBA::TypeCode_ptr IR_ValueMemberDef::type (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ return this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type (
-+ this,
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+IR_IDLType_ptr IR_ValueMemberDef::type_def (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ return this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type_def (
-+ this,
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+void IR_ValueMemberDef::type_def (
-+ IR_IDLType_ptr type_def,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type_def (
-+ this,
-+ type_def,
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+CORBA::Visibility IR_ValueMemberDef::access (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ return this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).access (
-+ this,
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+void IR_ValueMemberDef::access (
-+ CORBA::Visibility access,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).access (
-+ this,
-+ access,
-+ ACE_TRY_ENV
-+ );
-+}
-
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
-+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 = 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)
-+TAO_NAMESPACE_END
-
-- 9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0), // name = type_def
-- CORBA::tk_objref, // typecode kind
-- 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
+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
+ CORBA::tk_enum, // typecode kind
+@@ -43352,7 +42688,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
-+///////////////////////////////////////////////////////////////////////
-+// Base & Remote Proxy Implementation.
-+//
-
-- 7, ACE_NTOHL (0x61636365), ACE_NTOHL (0x73730000), // name = access
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-+_TAO_ValueDef_Proxy_Impl::_TAO_ValueDef_Proxy_Impl (void)
-+{}
-
-+_TAO_ValueDef_Remote_Proxy_Impl::_TAO_ValueDef_Remote_Proxy_Impl (void)
-+{}
-
-+// Remote Implementation of the IDL interface methods
-
-- 0U,
-+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 = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
-+
-+ 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",
-+ 25,
-+ 0,
-+ istub->orb_core ()
-+ );
-
-- 13, ACE_NTOHL (0x696e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657273), ACE_NTOHL (0x0), // name = initializers
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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
+ 7, ACE_NTOHL (0x61636365), ACE_NTOHL (0x73730000), // name = access
+ CORBA::tk_alias, // typecode kind for typedefs
+@@ -43372,7 +42708,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
-- CORBA::tk_sequence, // typecode kind
-- 504, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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
++ 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
+@@ -43380,14 +42716,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
-- 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
++ 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
-- CORBA::tk_sequence, // typecode kind
-- 252, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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
++ 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
+@@ -43395,7 +42731,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
-- 3, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
-+ 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;
-+ }
-
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
-+ return _tao_safe_retval._retn ();
-+}
-
-- 9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0), // name = type_def
-- CORBA::tk_objref, // typecode kind
-- 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
++ 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
+@@ -43414,7 +42750,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
-+void _TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
-+ CORBA_Object *_collocated_tao_target_,
-+ 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 ());
-
-+
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_set_supported_interfaces",
-+ 25,
-+ 1,
-+ istub->orb_core ()
-+ );
-
-- 0U,
-+ for (;;)
-+ {
-+ _tao_call.start (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 << supported_interfaces)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
-+ {
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
-+ }
-+
-+ break;
-+ }
-+}
-
-+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 = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
-+
-+ 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",
-+ 17,
-+ 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;
-+ }
-
-- 0U,
-+ return _tao_safe_retval._retn ();
-+}
-
-+void _TAO_ValueDef_Remote_Proxy_Impl::initializers (
-+ CORBA_Object *_collocated_tao_target_,
-+ 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 ());
-
-- 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
-- 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 = RepositoryIdSeq
-- CORBA::tk_sequence, // typecode kind
-- 84, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
-+
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_set_initializers",
-+ 17,
-+ 1,
-+ istub->orb_core ()
-+ );
-
-- 0U,
-+ for (;;)
-+ {
-+ _tao_call.start (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 << initializers)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
-+ {
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
-+ }
-+
-+ break;
-+ }
-+}
-
-+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 = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-- 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
-- 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 = RepositoryIdSeq
-- CORBA::tk_sequence, // typecode kind
-- 84, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
-+
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_get_base_value",
-+ 15,
-+ 0,
-+ istub->orb_core ()
-+ );
-
-- 0U,
-+ 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;
-+ }
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
-+ return _tao_safe_retval._retn ();
-+}
-- 15, ACE_NTOHL (0x69735f74), ACE_NTOHL (0x72756e63), ACE_NTOHL (0x61746162), ACE_NTOHL (0x6c650000), // name = is_truncatable
-- CORBA::tk_boolean,
-+void _TAO_ValueDef_Remote_Proxy_Impl::base_value (
-+ CORBA_Object *_collocated_tao_target_,
-+ 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 ());
-
-- 11, ACE_NTOHL (0x62617365), ACE_NTOHL (0x5f76616c), ACE_NTOHL (0x75650000), // name = base_value
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
-+
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_set_base_value",
-+ 15,
-+ 1,
-+ istub->orb_core ()
-+ );
-
-- 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-- CORBA::tk_TypeCode,
-+ for (;;)
-+ {
-+ _tao_call.start (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 << base_value)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
-+ {
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
-+ }
-+
-+ break;
-+ }
-+}
+ 0U,
+@@ -43489,14 +42825,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));
--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
++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)
-+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
-+ ))
++
++void IR_ValueDescription::_tao_any_destructor (void *x)
{
- ValueDescription *tmp = ACE_static_cast (ValueDescription*,x);
-- delete tmp;
--}
-+
-+ IR_ValueDefSeq *_tao_retval = 0;
-+
-+
-+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
++ IR_ValueDescription *tmp = ACE_static_cast (IR_ValueDescription*,x);
+ delete tmp;
+ }
-+
-+ 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",
-+ 25,
-+ 0,
-+ istub->orb_core ()
-+ );
-
--///////////////////////////////////////////////////////////////////////
--// Base & Remote Proxy Implementation.
--//
-+ 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;
-+ }
+@@ -43505,15 +42842,15 @@
+ // Base & Remote Proxy Implementation.
+ //
-IR::_TAO_ValueBoxDef_Proxy_Impl::_TAO_ValueBoxDef_Proxy_Impl (void)
--{}
-+ return _tao_safe_retval._retn ();
-+}
++_TAO_ValueBoxDef_Proxy_Impl::_TAO_ValueBoxDef_Proxy_Impl (void)
+ {}
-IR::_TAO_ValueBoxDef_Remote_Proxy_Impl::_TAO_ValueBoxDef_Remote_Proxy_Impl (void)
--{}
-+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
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW (CORBA::INTERNAL ());
-
--// Remote Implementation of the IDL interface methods
-+
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_set_abstract_base_values",
-+ 25,
-+ 1,
-+ istub->orb_core ()
-+ );
-+
-+ for (;;)
-+ {
-+ _tao_call.start (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 << abstract_base_values)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
-+ {
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
-+ }
-+
-+ break;
-+ }
-+}
++_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 (
-+CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
++IR_IDLType_ptr _TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -43009,160 +21178,131 @@
+@@ -43522,8 +42859,8 @@
))
{
- IR::IDLType_ptr _tao_retval = IR::IDLType::_nil ();
- IR::IDLType_var _tao_safe_retval (_tao_retval);
-+ CORBA::Boolean _tao_retval = 0;
++ 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);
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
- TAO_GIOP_Twoway_Invocation _tao_call (
- istub,
-- "_get_original_type_def",
-- 22,
-+ "_get_is_abstract",
-+ 16,
- 0,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -43551,7 +42888,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -43607,7 +42944,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ ACE_CHECK_RETURN (_tao_retval);
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-+ 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
-+ );
-+ }
-+ break;
-+ }
-+
-+ return _tao_retval;
-+}
-+
-+void _TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Boolean is_abstract,
-+ 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_is_abstract",
-+ 16,
-+ 1,
-+ istub->orb_core ()
-+ );
-+
-+ for (;;)
-+ {
-+ _tao_call.start (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_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
-+ ACE_CHECK;
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << CORBA::Any::from_boolean (is_abstract))
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
-+ }
-+
-+ break;
-+ }
++ IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -43673,19 +43010,15 @@
+ return _tao_safe_retval._retn ();
}
-void IR::_TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
-+CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_custom (
++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 ((
-@@ -43170,385 +21310,131 @@
+ CORBA::SystemException
))
{
-
+-
-
-+ CORBA::Boolean _tao_retval = 0;
-
-
- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
- if (istub == 0)
-- ACE_THROW (CORBA::INTERNAL ());
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
-
- TAO_GIOP_Twoway_Invocation _tao_call (
- istub,
-- "_set_original_type_def",
-- 22,
-- 1,
-+ "_get_is_custom",
-+ 14,
-+ 0,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -43711,7 +43044,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- original_type_def,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << original_type_def)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ ACE_CHECK_RETURN (_tao_retval);
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ _tao_retval
-+ );
- }
--
-- break;
-- }
--
--}
--
--
--//
--// End Base & Remote Proxy Implemeentation.
--///////////////////////////////////////////////////////////////////////
--
--
--///////////////////////////////////////////////////////////////////////
--// Remote & Base Proxy Broker Implementation
--//
--
++ IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ original_type_def,
+@@ -43835,37 +43168,37 @@
+ // 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)
--{
--}
--
--// Factory Member function Implementation.
--IR::_TAO_ValueBoxDef_Remote_Proxy_Broker *IR::_TAO_ValueBoxDef_Remote_Proxy_Broker::the_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
--{
++_TAO_ValueBoxDef_Proxy_Broker::~_TAO_ValueBoxDef_Proxy_Broker (void)
+ {
+ }
+
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_ValueBoxDef_Remote_Proxy_Broker *
+-IR::_TAO_ValueBoxDef_Remote_Proxy_Broker::the_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
++_TAO_ValueBoxDef_Remote_Proxy_Broker *
++_TAO_ValueBoxDef_Remote_Proxy_Broker::the_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
+ {
- static ::IR::_TAO_ValueBoxDef_Remote_Proxy_Broker remote_proxy_broker;
-- return &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,
-- 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
++_TAO_ValueBoxDef_Proxy_Impl&
++_TAO_ValueBoxDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_ValueBoxDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -43881,109 +43214,109 @@
+
+
+ // default constructor
-IR::ValueBoxDef::ValueBoxDef (int collocated)
--{
-- this->_tao_setup_collocation (collocated);
--}
--
--// destructor
++IR_ValueBoxDef::IR_ValueBoxDef (int collocated)
+ {
+ this->IR_ValueBoxDef_setup_collocation (collocated);
+ }
+
+ // destructor
-IR::ValueBoxDef::~ValueBoxDef (void)
--{}
--
--void
--IR::ValueBoxDef::_tao_setup_collocation (int collocated)
--{
-- if (collocated)
-- this->the_TAO_ValueBoxDef_Proxy_Broker_ =
++IR_ValueBoxDef::~IR_ValueBoxDef (void)
+ {}
+
+ void
+-IR::ValueBoxDef::IR_ValueBoxDef_setup_collocation (int collocated)
++IR_ValueBoxDef::IR_ValueBoxDef_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_ValueBoxDef_Proxy_Broker_ =
- ::IR__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer (this);
-- else
-- this->the_TAO_ValueBoxDef_Proxy_Broker_ =
++ _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 ();
--
-- ACE_NESTED_CLASS (IR, TypedefDef)::_tao_setup_collocation (collocated);
--}
-+ 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
-+ );
-+ }
-+ break;
-+ }
++ _TAO_ValueBoxDef_Remote_Proxy_Broker::the_TAO_ValueBoxDef_Remote_Proxy_Broker ();
+
+ this->IR_TypedefDef_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);
-- CORBA::release (tmp);
-+ return _tao_retval;
++ IR_ValueBoxDef *tmp = ACE_static_cast (IR_ValueBoxDef*,x);
+ CORBA::release (tmp);
}
-IR::ValueBoxDef_ptr IR::ValueBoxDef::_narrow (
-- CORBA::Object_ptr obj,
-+void _TAO_ValueDef_Remote_Proxy_Impl::is_custom (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Boolean is_custom,
++IR_ValueBoxDef_ptr IR_ValueBoxDef::_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &ACE_TRY_ENV
)
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
{
-- if (CORBA::is_nil (obj))
+ if (CORBA::is_nil (obj))
- return ValueBoxDef::_nil ();
-- if (! obj->_is_local ())
-- {
-- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ValueBoxDef:1.0", ACE_TRY_ENV);
++ 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 ());
-- if (is_a == 0)
++ 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);
--}
-+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW (CORBA::INTERNAL ());
++ return IR_ValueBoxDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
-IR::ValueBoxDef_ptr IR::ValueBoxDef::_unchecked_narrow (
-- CORBA::Object_ptr obj,
-- CORBA::Environment &
-- )
--{
-- if (CORBA::is_nil (obj))
++IR_ValueBoxDef_ptr IR_ValueBoxDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
- return ValueBoxDef::_nil ();
-- if (! obj->_is_local ())
-- {
-- TAO_Stub* stub = obj->_stubobj ();
-- if (stub)
-- stub->_incr_refcnt ();
++ return IR_ValueBoxDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
- ValueBoxDef_ptr default_proxy = ValueBoxDef::_nil ();
-+
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_set_is_custom",
-+ 14,
-+ 1,
-+ istub->orb_core ()
-+ );
-
-- if (
-- !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-- stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
++ 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
-- )
-+ for (;;)
++ obj->_is_collocated () &&_TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer != 0
+ )
{
-- ACE_NEW_RETURN (
-- default_proxy,
+ ACE_NEW_RETURN (
+ default_proxy,
- ::IR::ValueBoxDef (
-- stub,
-- 1,
-- obj->_servant ()),
--
++ ::IR_ValueBoxDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
- ValueBoxDef::_nil ());
-- }
-- if (CORBA::is_nil (default_proxy))
++ IR_ValueBoxDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, ::IR::ValueBoxDef (stub, 0, obj->_servant ()), ValueBoxDef::_nil ());
-- return default_proxy;
-- }
-- else
-- return
-- ACE_reinterpret_cast
-- (
++ ACE_NEW_RETURN (default_proxy, ::IR_ValueBoxDef (stub, 0, obj->_servant ()), IR_ValueBoxDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
- ValueBoxDef_ptr,
-- obj->_tao_QueryInterface
-- (
-- ACE_reinterpret_cast
-- (
-- ptr_arith_t,
++ IR_ValueBoxDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
- &ValueBoxDef::_narrow
-- )
-- )
-+ _tao_call.start (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
++ &IR_ValueBoxDef::_narrow
+ )
+ )
);
-+ ACE_CHECK;
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << CORBA::Any::from_boolean (is_custom))
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
-+ {
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
-+ }
-+
-+ break;
-+ }
}
-IR::ValueBoxDef_ptr
-IR::ValueBoxDef::_duplicate (ValueBoxDef_ptr obj)
--{
-- if (!CORBA::is_nil (obj))
-- obj->_add_ref ();
-- return 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)
--{
-- 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);
--}
--
++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")) ||
+@@ -43997,58 +43330,58 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
-void *IR::ValueBoxDef::_tao_QueryInterface (ptr_arith_t type)
--{
-- void *retv = 0;
-- if (type == ACE_reinterpret_cast
-- (ptr_arith_t,
++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))
-- retv = ACE_reinterpret_cast (void*, this);
-- else 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,
- &ACE_NESTED_CLASS (::IR, TypedefDef)::_narrow))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_TypedefDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
- IR::IDLType_ptr,
-- this
-- )
-- );
-- else if (type == ACE_reinterpret_cast
-- (ptr_arith_t,
++ 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::_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;
--}
--
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -44061,12 +43394,12 @@
+ return retv;
+ }
+
-const char* IR::ValueBoxDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/ValueBoxDef:1.0";
--}
--
++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 (
-+CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
-+ CORBA_Object *_collocated_tao_target_,
++IR_IDLType_ptr IR_ValueBoxDef::original_type_def (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -43556,169 +21442,401 @@
- ))
- {
-
-- return this->the_TAO_ValueBoxDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).original_type_def (
-- this,
-- ACE_TRY_ENV
-+ CORBA::Boolean _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_is_truncatable",
-+ 19,
-+ 0,
-+ istub->orb_core ()
+@@ -44083,8 +43416,8 @@
);
-+
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
-+ );
-+ ACE_CHECK_RETURN (_tao_retval);
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ 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),
-+ _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
-+ );
-+ }
-+ break;
-+ }
-+
-+ return _tao_retval;
}
-void IR::ValueBoxDef::original_type_def (
- IR::IDLType_ptr original_type_def,
-+void _TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Boolean is_truncatable,
++void IR_ValueBoxDef::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 ());
-+
-
-- this->the_TAO_ValueBoxDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).original_type_def (
-- this,
-- original_type_def,
-- ACE_TRY_ENV
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_set_is_truncatable",
-+ 19,
-+ 1,
-+ istub->orb_core ()
+@@ -44102,9 +43435,8 @@
);
--}
-
-+ for (;;)
-+ {
-+ _tao_call.start (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 << CORBA::Any::from_boolean (is_truncatable))
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
-+ {
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
-+ }
-+
-+ break;
-+ }
-+}
+ }
--#if (TAO_HAS_INTERCEPTORS == 1)
--IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-+CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_a (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV
- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
-
--Dynamic::ParameterList *
+ #if (TAO_HAS_INTERCEPTORS == 1)
+-IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get (
++IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -44113,7 +43445,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -44125,7 +43457,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ CORBA::Boolean _tao_retval = 0;
-
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -44138,7 +43470,7 @@
+
+
+ CORBA::Any *
-IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- CORBA::Any_var safe_result_any = result_any;
-+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-+
-
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "is_a",
-+ 4,
-+ 1,
-+ istub->orb_core ()
-+ );
-
--void
++IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -44154,16 +43486,16 @@
+ }
+
+ void
-IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::result (IR::IDLType_ptr result)
--{
-- // update the result
-- this->_result = result;
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
-+ );
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id)
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ _tao_retval
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ 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),
-+ _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
-+ );
-+ }
-+ break;
-+ }
-+
-+ return _tao_retval;
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- IR::IDLType_ptr original_type_def,
-- CORBA::Environment &
-+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,
-+ CORBA::Visibility access,
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &
)
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- original_type_def_ (original_type_def)
--{}
--
--Dynamic::ParameterList *
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -44171,7 +43503,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_original_type_def = parameter_list->length ();
-- parameter_list->length (length_original_type_def + 1);
-- (*parameter_list)[length_original_type_def].argument <<= this->original_type_def_;
-+ IR_ValueMemberDef_ptr _tao_retval = IR_ValueMemberDef::_nil ();
-+ IR_ValueMemberDef_var _tao_safe_retval (_tao_retval);
-
-- (*parameter_list)[length_original_type_def].mode = Dynamic::PARAM_IN;
-
-- return safe_parameter_list._retn ();
--}
-+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
++IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -44191,7 +43523,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return exception_list;
--}
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "create_value_member",
-+ 19,
-+ 1,
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
-+ (_tao_out << name) &&
-+ (_tao_out << version) &&
-+ (_tao_out << type) &&
-+ (_tao_out << access)
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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;
-+ }
++IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -44204,7 +43536,7 @@
--CORBA::Any *
+
+ CORBA::Any *
-IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return result_any;
-+ return _tao_safe_retval._retn ();
++IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -44217,13 +43549,14 @@
}
--#endif /* TAO_HAS_INTERCEPTORS */
--static const CORBA::Long _oc_IR_ValueBoxDef[] =
-+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,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
+ #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
+ 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));
--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
--
--///////////////////////////////////////////////////////////////////////
--// Base & Remote Proxy Implementation.
--//
-+
-+ IR_AttributeDef_ptr _tao_retval = IR_AttributeDef::_nil ();
-+ IR_AttributeDef_var _tao_safe_retval (_tao_retval);
-+
-+
-+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
++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)
+@@ -44233,15 +43566,15 @@
+ // Base & Remote Proxy Implementation.
+ //
-IR::_TAO_ProvidesDef_Proxy_Impl::_TAO_ProvidesDef_Proxy_Impl (void)
--{}
-+
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "create_attribute",
-+ 16,
-+ 1,
-+ istub->orb_core ()
-+ );
++_TAO_ProvidesDef_Proxy_Impl::_TAO_ProvidesDef_Proxy_Impl (void)
+ {}
-IR::_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_Proxy_Impl (void)
--{}
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
-+ (_tao_out << name) &&
-+ (_tao_out << version) &&
-+ (_tao_out << type) &&
-+ (_tao_out << mode) &&
-+ (_tao_out << get_exceptions) &&
-+ (_tao_out << put_exceptions)
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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;
-+ }
++_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_Proxy_Impl (void)
+ {}
--// Remote Implementation of the IDL interface methods
-+ return _tao_safe_retval._retn ();
-+}
+ // Remote Implementation of the IDL interface methods
-IR::InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
-+IR_OperationDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_operation (
++IR_InterfaceDef_ptr _TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
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 ((
-@@ -43726,8 +21844,8 @@
+@@ -44250,8 +43583,8 @@
))
{
- IR::InterfaceDef_ptr _tao_retval = IR::InterfaceDef::_nil ();
- IR::InterfaceDef_var _tao_safe_retval (_tao_retval);
-+ IR_OperationDef_ptr _tao_retval = IR_OperationDef::_nil ();
-+ IR_OperationDef_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 ();
-@@ -43737,143 +21855,70 @@
-
- TAO_GIOP_Twoway_Invocation _tao_call (
- istub,
-- "_get_interface_type",
-- 19,
-- 0,
-+ "create_operation",
-+ 16,
-+ 1,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -44279,7 +43612,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -44335,7 +43668,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ 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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- 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) &&
-+ (_tao_out << result) &&
-+ (_tao_out << mode) &&
-+ (_tao_out << params) &&
-+ (_tao_out << exceptions) &&
-+ (_tao_out << contexts)
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 0
- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
-
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-+ 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)
- {
-- _tao_call.restart_flag (1);
-- continue;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
--
-- break;
-- }
-+ 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;
-+ }
-+
- return _tao_safe_retval._retn ();
- }
-
-@@ -43887,32 +21932,32 @@
++ IR_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -44411,37 +43744,37 @@
// Remote & Base Proxy Broker Implementation
//
-IR::_TAO_ProvidesDef_Proxy_Broker::_TAO_ProvidesDef_Proxy_Broker (void)
-+_TAO_ValueDef_Proxy_Broker::_TAO_ValueDef_Proxy_Broker (void)
++_TAO_ProvidesDef_Proxy_Broker::_TAO_ProvidesDef_Proxy_Broker (void)
{
}
-IR::_TAO_ProvidesDef_Proxy_Broker::~_TAO_ProvidesDef_Proxy_Broker (void)
-+_TAO_ValueDef_Proxy_Broker::~_TAO_ValueDef_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_ValueDef_Remote_Proxy_Broker *the_TAO_ValueDef_Remote_Proxy_Broker (void)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_ProvidesDef_Remote_Proxy_Broker *
+-IR::_TAO_ProvidesDef_Remote_Proxy_Broker::the_TAO_ProvidesDef_Remote_Proxy_Broker (void)
++_TAO_ProvidesDef_Remote_Proxy_Broker *
++_TAO_ProvidesDef_Remote_Proxy_Broker::the_TAO_ProvidesDef_Remote_Proxy_Broker (void)
{
- static ::IR::_TAO_ProvidesDef_Remote_Proxy_Broker remote_proxy_broker;
-+ static ::_TAO_ValueDef_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_ValueDef_Remote_Proxy_Broker::_TAO_ValueDef_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_ValueDef_Remote_Proxy_Broker::~_TAO_ValueDef_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_ValueDef_Proxy_Impl&
-+_TAO_ValueDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_ValueDef *object,
++_TAO_ProvidesDef_Proxy_Impl&
++_TAO_ProvidesDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_ProvidesDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -43928,166 +21973,426 @@
+@@ -44457,109 +43790,109 @@
// default constructor
-IR::ProvidesDef::ProvidesDef (int collocated)
-+IR_ValueDef::IR_ValueDef (int collocated)
++IR_ProvidesDef::IR_ProvidesDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_ProvidesDef_setup_collocation (collocated);
}
// destructor
-IR::ProvidesDef::~ProvidesDef (void)
-+IR_ValueDef::~IR_ValueDef (void)
++IR_ProvidesDef::~IR_ProvidesDef (void)
{}
void
--IR::ProvidesDef::_tao_setup_collocation (int collocated)
-+IR_ValueDef::_tao_setup_collocation (int collocated)
+-IR::ProvidesDef::IR_ProvidesDef_setup_collocation (int collocated)
++IR_ProvidesDef::IR_ProvidesDef_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_ProvidesDef_Proxy_Broker_ =
+ this->the_TAO_ProvidesDef_Proxy_Broker_ =
- ::IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_ValueDef_Proxy_Broker_ =
-+ _TAO_ValueDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_ProvidesDef_Proxy_Broker_ =
+ this->the_TAO_ProvidesDef_Proxy_Broker_ =
- ::IR::_TAO_ProvidesDef_Remote_Proxy_Broker::the_TAO_ProvidesDef_Remote_Proxy_Broker ();
-+ 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);
++ _TAO_ProvidesDef_Remote_Proxy_Broker::the_TAO_ProvidesDef_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (IR, Contained)::_tao_setup_collocation (collocated);
+ this->IR_Contained_setup_collocation (collocated);
}
-void IR::ProvidesDef::_tao_any_destructor (void *x)
-+void IR_ValueDef::_tao_any_destructor (void *x)
++void IR_ProvidesDef::_tao_any_destructor (void *x)
{
- ProvidesDef *tmp = ACE_static_cast (ProvidesDef*,x);
-+ IR_ValueDef *tmp = ACE_static_cast (IR_ValueDef*,x);
++ IR_ProvidesDef *tmp = ACE_static_cast (IR_ProvidesDef*,x);
CORBA::release (tmp);
}
-IR::ProvidesDef_ptr IR::ProvidesDef::_narrow (
-+IR_ValueDef_ptr IR_ValueDef::_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_ValueDef::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ProvidesDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (ProvidesDef::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ValueDef:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_ValueDef::_nil ());
++ ACE_CHECK_RETURN (IR_ProvidesDef::_nil ());
if (is_a == 0)
- return ProvidesDef::_nil ();
-+ return IR_ValueDef::_nil ();
++ return IR_ProvidesDef::_nil ();
}
- return ProvidesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_ValueDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_ProvidesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::ProvidesDef_ptr IR::ProvidesDef::_unchecked_narrow (
-+IR_ValueDef_ptr IR_ValueDef::_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_ValueDef::_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_ValueDef_ptr default_proxy = IR_ValueDef::_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_ValueDef_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_ValueDef (
++ ::IR_ProvidesDef (
stub,
1,
obj->_servant ()),
- ProvidesDef::_nil ());
-+ IR_ValueDef::_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_ValueDef (stub, 0, obj->_servant ()), IR_ValueDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_ProvidesDef (stub, 0, obj->_servant ()), IR_ProvidesDef::_nil ());
return default_proxy;
}
else
@@ -55132,14 +23396,14 @@
ACE_reinterpret_cast
(
- ProvidesDef_ptr,
-+ IR_ValueDef_ptr,
++ IR_ProvidesDef_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &ProvidesDef::_narrow
-+ &IR_ValueDef::_narrow
++ &IR_ProvidesDef::_narrow
)
)
);
@@ -55147,3147 +23411,1089 @@
-IR::ProvidesDef_ptr
-IR::ProvidesDef::_duplicate (ProvidesDef_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)
-+{
-+ 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;
-+}
-+
-+const char* IR_ValueDef::_interface_repository_id (void) const
-+{
-+ return "IDL:omg.org/IR/ValueDef:1.0";
-+}
-+
-+IR_InterfaceDefSeq * IR_ValueDef::supported_interfaces (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).supported_interfaces (
-+ this,
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+void IR_ValueDef::supported_interfaces (
-+ const IR_InterfaceDefSeq & supported_interfaces,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).supported_interfaces (
-+ this,
-+ supported_interfaces,
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+IR_InitializerSeq * IR_ValueDef::initializers (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).initializers (
-+ this,
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+void IR_ValueDef::initializers (
-+ const IR_InitializerSeq & initializers,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).initializers (
-+ this,
-+ initializers,
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+IR_ValueDef_ptr IR_ValueDef::base_value (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).base_value (
-+ this,
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+void IR_ValueDef::base_value (
-+ IR_ValueDef_ptr base_value,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).base_value (
-+ this,
-+ base_value,
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+IR_ValueDefSeq * IR_ValueDef::abstract_base_values (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).abstract_base_values (
-+ this,
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+void IR_ValueDef::abstract_base_values (
-+ const IR_ValueDefSeq & abstract_base_values,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).abstract_base_values (
-+ this,
-+ abstract_base_values,
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+CORBA::Boolean IR_ValueDef::is_abstract (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_abstract (
-+ this,
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+void IR_ValueDef::is_abstract (
-+ CORBA::Boolean is_abstract,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ 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
-+ ))
- {
-- if (!CORBA::is_nil (obj))
-- obj->_add_ref ();
-- return obj;
-+
-+ this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_custom (
-+ this,
-+ is_custom,
-+ ACE_TRY_ENV
-+ );
++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_ValueDef::is_truncatable (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- 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);
-+
-+ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_truncatable (
-+ this,
-+ 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")) ||
+@@ -44571,34 +43904,34 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::ProvidesDef::_tao_QueryInterface (ptr_arith_t type)
-+void IR_ValueDef::is_truncatable (
-+ CORBA::Boolean is_truncatable,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- void *retv = 0;
-- if (type == ACE_reinterpret_cast
-- (ptr_arith_t,
++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))
-- retv = ACE_reinterpret_cast (void*, this);
-- else 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,
- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_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::_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;
-+
-+ this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_truncatable (
-+ this,
-+ is_truncatable,
-+ ACE_TRY_ENV
-+ );
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -44611,12 +43944,12 @@
+ return retv;
}
-const char* IR::ProvidesDef::_interface_repository_id (void) const
-+CORBA::Boolean IR_ValueDef::is_a (
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- return "IDL:omg.org/IR/ProvidesDef:1.0";
-+
-+ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_a (
-+ this,
-+ id,
-+ ACE_TRY_ENV
-+ );
++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_ValueMemberDef_ptr IR_ValueDef::create_value_member (
-+ const char * id,
-+ const char * name,
-+ const char * version,
-+ IR_IDLType_ptr type,
-+ CORBA::Visibility access,
++IR_InterfaceDef_ptr IR_ProvidesDef::interface_type (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -44095,863 +22400,704 @@
- ))
- {
-
-- return this->the_TAO_ProvidesDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).interface_type (
-+ 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
+@@ -44633,9 +43966,8 @@
);
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-+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
- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -44644,7 +43976,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return parameter_list;
-+ 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
-+ );
- }
-
--Dynamic::ExceptionList *
++IR_ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -44656,7 +43988,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+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
-+ ))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return exception_list;
-+ 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
-+ );
- }
-
-+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 = 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
-+ 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 = ValueDescription
-+ 15, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-+
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-+
-+ 12, ACE_NTOHL (0x69735f61), ACE_NTOHL (0x62737472), ACE_NTOHL (0x61637400), // name = is_abstract
-+ CORBA::tk_boolean,
-+
-+ 10, ACE_NTOHL (0x69735f63), ACE_NTOHL (0x7573746f), ACE_NTOHL (0x6d000000), // name = is_custom
-+ CORBA::tk_boolean,
-+
-+ 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-+
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
-+
-+ 11, ACE_NTOHL (0x6f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e730000), // name = operations
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = OpDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 1896, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = OperationDescription
-+ 9, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-+
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = 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
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-+
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
-+
-+ 7, ACE_NTOHL (0x72657375), ACE_NTOHL (0x6c740000), // name = result
-+ CORBA::tk_TypeCode,
-+
-+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-+ CORBA::tk_enum, // typecode kind
-+ 100, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/OperationMode:1.0
-+ 14, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e4d6f64), ACE_NTOHL (0x65000000), // name = OperationMode
-+ 2, // member count
-+ 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
-
--CORBA::Any *
++IR_ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -44669,7 +44001,7 @@
+
+
+ CORBA::Any *
-IR::ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
-+ 9, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x65787473), ACE_NTOHL (0x0), // name = contexts
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = ContextIdSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 160, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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
-+ 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_string,
-+ 0U, // string length
-
--void
++IR_ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -44685,24 +44017,26 @@
+ }
+
+ void
-IR::ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (IR::InterfaceDef_ptr result)
--{
-- // update the result
-- this->_result = result;
--}
++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
+ #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));
--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 = ProvidesDescription
-- 5, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
-+ 0U,
-
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
-+ 11, ACE_NTOHL (0x70617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72730000), // name = parameters
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = ParDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 404, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = ParameterDescription
-+ 4, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
-
-- 15, ACE_NTOHL (0x696e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x655f7479), ACE_NTOHL (0x70650000), // name = interface_type
-- 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
++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
+@@ -44750,17 +44084,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
-+ 9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0), // name = type_def
-+ CORBA::tk_objref, // typecode kind
-+ 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 = IR_IDLType
++ 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));
--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
++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);
-- delete tmp;
--}
-+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-+ CORBA::tk_enum, // typecode kind
-+ 116, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x6172616d), ACE_NTOHL (0x65746572), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ParameterMode:1.0
-+ 14, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x724d6f64), ACE_NTOHL (0x65000000), // name = ParameterMode
-+ 3, // member count
-+ 9, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x0), // name = PARAM_IN
-+ 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
-
-
--///////////////////////////////////////////////////////////////////////
--// Base & Remote Proxy Implementation.
--//
-+ 0U,
++ IR_ProvidesDescription *tmp = ACE_static_cast (IR_ProvidesDescription*,x);
+ delete tmp;
+ }
+
+@@ -44769,15 +44104,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)
--{}
-+ 11, ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = exceptions
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = ExcDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 456, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = ExceptionDescription
-+ 5, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-
--// Remote Implementation of the IDL interface methods
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
++_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 (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
++IR_InterfaceDef_ptr _TAO_UsesDef_Remote_Proxy_Impl::interface_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -44786,8 +44121,8 @@
+ ))
+ {
+
- 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);
-+ 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
--
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_get_interface_type",
-- 19,
-- 0,
-- istub->orb_core ()
-- );
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ IR_InterfaceDef_ptr _tao_retval = IR_InterfaceDef::_nil ();
++ IR_InterfaceDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -44815,7 +44150,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -44871,7 +44206,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
++ IR_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -44937,7 +44272,7 @@
+ return _tao_safe_retval._retn ();
+ }
-CORBA::Boolean IR::_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 = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-+ 0U,
-+
-
--
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_get_is_multiple",
-- 16,
-- 0,
-- istub->orb_core ()
-- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++CORBA::Boolean _TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -44974,7 +44309,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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))
-- ))
-- {
-- TAO_INTERCEPTOR_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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 0U,
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_retval;
--}
-
-+ 11, ACE_NTOHL (0x61747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65730000), // name = attributes
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = AttrDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 1708, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = AttributeDescription
-+ 8, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-
--//
--// End Base & Remote Proxy Implemeentation.
--///////////////////////////////////////////////////////////////////////
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = 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
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
--///////////////////////////////////////////////////////////////////////
--// Remote & Base Proxy Broker Implementation
--//
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
++ IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -45105,37 +44440,38 @@
+ // Remote & Base Proxy Broker Implementation
+ //
-IR::_TAO_UsesDef_Proxy_Broker::_TAO_UsesDef_Proxy_Broker (void)
--{
--}
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
++_TAO_UsesDef_Proxy_Broker::_TAO_UsesDef_Proxy_Broker (void)
+ {
+ }
-IR::_TAO_UsesDef_Proxy_Broker::~_TAO_UsesDef_Proxy_Broker (void)
--{
--}
-+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
-+ CORBA::tk_enum, // typecode kind
-+ 104, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/AttributeMode:1.0
-+ 14, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x654d6f64), ACE_NTOHL (0x65000000), // name = AttributeMode
-+ 2, // member count
-+ 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
-
--// Factory Member function Implementation.
--IR::_TAO_UsesDef_Remote_Proxy_Broker *IR::_TAO_UsesDef_Remote_Proxy_Broker::the_TAO_UsesDef_Remote_Proxy_Broker (void)
--{
++_TAO_UsesDef_Proxy_Broker::~_TAO_UsesDef_Proxy_Broker (void)
+ {
+ }
+
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_UsesDef_Remote_Proxy_Broker *
+-IR::_TAO_UsesDef_Remote_Proxy_Broker::the_TAO_UsesDef_Remote_Proxy_Broker (void)
++_TAO_UsesDef_Remote_Proxy_Broker *
++_TAO_UsesDef_Remote_Proxy_Broker::the_TAO_UsesDef_Remote_Proxy_Broker (void)
+ {
- static ::IR::_TAO_UsesDef_Remote_Proxy_Broker remote_proxy_broker;
-- return &remote_proxy_broker;
--}
-+ 15, ACE_NTOHL (0x6765745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = get_exceptions
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = ExcDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 456, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = ExceptionDescription
-+ 5, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
++ 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)
--{
--}
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
++_TAO_UsesDef_Remote_Proxy_Broker::_TAO_UsesDef_Remote_Proxy_Broker (void)
+ {
+ }
-IR::_TAO_UsesDef_Remote_Proxy_Broker::~_TAO_UsesDef_Remote_Proxy_Broker (void)
--{
--}
-+ 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
++_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,
-- CORBA::Environment &ACE_TRY_ENV
--)
--{
-- ACE_UNUSED_ARG (object);
-- ACE_UNUSED_ARG (ACE_TRY_ENV);
-- return remote_proxy_impl_;
--}
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
-
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
-
--//
--// End Remote & Base Proxy Broker Implementation
--///////////////////////////////////////////////////////////////////////
-
-+ 0U,
-
--// default constructor
++_TAO_UsesDef_Proxy_Impl&
++_TAO_UsesDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_UsesDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -45151,109 +44487,109 @@
+
+
+ // default constructor
-IR::UsesDef::UsesDef (int collocated)
--{
-- this->_tao_setup_collocation (collocated);
--}
++IR_UsesDef::IR_UsesDef (int collocated)
+ {
+ this->IR_UsesDef_setup_collocation (collocated);
+ }
--// destructor
+ // destructor
-IR::UsesDef::~UsesDef (void)
--{}
-+ 15, ACE_NTOHL (0x7075745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = put_exceptions
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = ExcDescriptionSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 456, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = ExceptionDescription
-+ 5, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-
--void
--IR::UsesDef::_tao_setup_collocation (int collocated)
--{
-- if (collocated)
-- this->the_TAO_UsesDef_Proxy_Broker_ =
++IR_UsesDef::~IR_UsesDef (void)
+ {}
+
+ void
+-IR::UsesDef::IR_UsesDef_setup_collocation (int collocated)
++IR_UsesDef::IR_UsesDef_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_UsesDef_Proxy_Broker_ =
- ::IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer (this);
-- else
-- this->the_TAO_UsesDef_Proxy_Broker_ =
++ _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 ();
--
-- ACE_NESTED_CLASS (IR, Contained)::_tao_setup_collocation (collocated);
--}
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
++ _TAO_UsesDef_Remote_Proxy_Broker::the_TAO_UsesDef_Remote_Proxy_Broker ();
+
+ this->IR_Contained_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);
-- CORBA::release (tmp);
--}
-+ 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-+
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
-+
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
-+
-+
-+ 0U,
++ 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))
++IR_UsesDef_ptr IR_UsesDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
- return UsesDef::_nil ();
-- if (! obj->_is_local ())
-- {
-- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/UsesDef:1.0", ACE_TRY_ENV);
++ 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 ());
-- if (is_a == 0)
++ 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 (
-- CORBA::Object_ptr obj,
-- CORBA::Environment &
-- )
--{
-- if (CORBA::is_nil (obj))
++IR_UsesDef_ptr IR_UsesDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
- return UsesDef::_nil ();
-- if (! obj->_is_local ())
-- {
-- TAO_Stub* stub = obj->_stubobj ();
-- if (stub)
-- stub->_incr_refcnt ();
++ 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 () &&
+ 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
-- )
-- {
-- ACE_NEW_RETURN (
-- default_proxy,
++ obj->_is_collocated () &&_TAO_UsesDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
- ::IR::UsesDef (
-- stub,
-- 1,
-- obj->_servant ()),
--
++ ::IR_UsesDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
- UsesDef::_nil ());
-- }
-- if (CORBA::is_nil (default_proxy))
++ IR_UsesDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, ::IR::UsesDef (stub, 0, obj->_servant ()), UsesDef::_nil ());
-- return default_proxy;
-- }
-- else
-- return
-- ACE_reinterpret_cast
-- (
++ ACE_NEW_RETURN (default_proxy, ::IR_UsesDef (stub, 0, obj->_servant ()), IR_UsesDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
- UsesDef_ptr,
-- obj->_tao_QueryInterface
-- (
-- ACE_reinterpret_cast
-- (
-- ptr_arith_t,
++ IR_UsesDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
- &UsesDef::_narrow
-- )
-- )
-- );
--}
-+ 0U,
++ &IR_UsesDef::_narrow
+ )
+ )
+ );
+ }
-IR::UsesDef_ptr
-IR::UsesDef::_duplicate (UsesDef_ptr obj)
--{
-- if (!CORBA::is_nil (obj))
-- obj->_add_ref ();
-- return 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)
--{
-- 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);
--}
-+ 8, ACE_NTOHL (0x6d656d62), ACE_NTOHL (0x65727300), // name = members
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = ValueMemberSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 592, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = ValueMember
-+ 7, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
++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")) ||
+@@ -45265,34 +44601,34 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
-void *IR::UsesDef::_tao_QueryInterface (ptr_arith_t type)
--{
-- void *retv = 0;
-- if (type == ACE_reinterpret_cast
-- (ptr_arith_t,
++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))
-- retv = ACE_reinterpret_cast (void*, this);
-- else 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,
- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_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::_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;
--}
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -45305,12 +44641,12 @@
+ return retv;
+ }
-const char* IR::UsesDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/UsesDef:1.0";
--}
-+ 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
++const char* IR_UsesDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/UsesDef:1.0";
+ }
-IR::InterfaceDef_ptr IR::UsesDef::interface_type (
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- return this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).interface_type (
-- this,
-- ACE_TRY_ENV
-- );
--}
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
++IR_InterfaceDef_ptr IR_UsesDef::interface_type (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -45327,7 +44663,7 @@
+ );
+ }
-CORBA::Boolean IR::UsesDef::is_multiple (
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- return this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_multiple (
-- this,
-- ACE_TRY_ENV
-- );
--}
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
-
-+ 9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0), // name = type_def
-+ CORBA::tk_objref, // typecode kind
-+ 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 = IR_IDLType
++CORBA::Boolean IR_UsesDef::is_multiple (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -45344,9 +44680,8 @@
+ );
+ }
--#if (TAO_HAS_INTERCEPTORS == 1)
+-
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
-+ 7, ACE_NTOHL (0x61636365), ACE_NTOHL (0x73730000), // name = access
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-
--Dynamic::ParameterList *
++IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -45355,7 +44690,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
++IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -45367,7 +44702,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
++IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -45380,7 +44715,7 @@
-+ 0U,
--CORBA::Any *
+ CORBA::Any *
-IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
++IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -45396,13 +44731,13 @@
+ }
--void
+ void
-IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (IR::InterfaceDef_ptr result)
--{
-- // update the result
-- this->_result = result;
--}
-+ 13, ACE_NTOHL (0x696e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657273), ACE_NTOHL (0x0), // name = initializers
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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
-+ 504, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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
-+ 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
-+ 252, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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
-+ 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_string,
-+ 0U, // string length
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
-
--Dynamic::ParameterList *
++IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -45411,7 +44746,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+ 9, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f646566), ACE_NTOHL (0x0), // name = type_def
-+ CORBA::tk_objref, // typecode kind
-+ 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 = IR_IDLType
++IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -45423,7 +44758,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+
-+ 0U,
++IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -45436,7 +44771,7 @@
--CORBA::Any *
+ CORBA::Any *
-IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-- return safe_result_any._retn ();
--}
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-+
-+
-+ 0U,
++IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -45452,24 +44787,26 @@
+ }
--void
+ void
-IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Boolean result)
--{
-- // update the result
-- this->_result = result;
--}
++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
+ #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));
--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 = UsesDescription
-- 6, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ 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
-- 64, // encapsulation length
-+ 156, // 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_string,
-- 0U, // string length
-+ 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 = RepositoryIdSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 84, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
-- 3, ACE_NTOHL (0x69640000), // name = id
-+ 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
-- 68, // encapsulation length
-+ 156, // 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
-+ 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 = RepositoryIdSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 84, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
-- 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ 0U,
-+
-+
-+ 15, ACE_NTOHL (0x69735f74), ACE_NTOHL (0x72756e63), ACE_NTOHL (0x61746162), ACE_NTOHL (0x6c650000), // name = is_truncatable
-+ CORBA::tk_boolean,
++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
+
-+ 11, ACE_NTOHL (0x62617365), ACE_NTOHL (0x5f76616c), ACE_NTOHL (0x75650000), // name = base_value
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
+ static const CORBA::Long _oc_IR_UsesDescription[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -45517,38 +44854,35 @@
+ 60, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -44960,558 +23106,470 @@
- CORBA::tk_string,
- 0U, // string length
-
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
--
-- 15, ACE_NTOHL (0x696e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x655f7479), ACE_NTOHL (0x70650000), // name = interface_type
-- 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
+ 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
--
-- 12, ACE_NTOHL (0x69735f6d), ACE_NTOHL (0x756c7469), ACE_NTOHL (0x706c6500), // name = is_multiple
-- CORBA::tk_boolean,
-+ 5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
-+ CORBA::tk_TypeCode,
++ 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_ValueDescription (CORBA::tk_struct, sizeof (_oc_IR_ValueDescription), (char *) &_oc_IR_ValueDescription, 0, sizeof (IR_ValueDescription));
++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_DEFINE (CORBA::TypeCode_ptr, _tc_ValueDescription, &_tc_TAO_tc_IR_ValueDescription)
+ 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_ValueDescription::_tao_any_destructor (void *x)
++void IR_UsesDescription::_tao_any_destructor (void *x)
{
- UsesDescription *tmp = ACE_static_cast (UsesDescription*,x);
-+ IR_ValueDescription *tmp = ACE_static_cast (IR_ValueDescription*,x);
++ IR_UsesDescription *tmp = ACE_static_cast (IR_UsesDescription*,x);
delete tmp;
}
-
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CS_
-+///////////////////////////////////////////////////////////////////////
-+// Base & Remote Proxy Implementation.
-+//
-
-- void
+-
+ 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;
-- tmp = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (length);
--
-- if (this->buffer_ != 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_);
--
-- 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;
-- }
-+_TAO_ValueBoxDef_Proxy_Impl::_TAO_ValueBoxDef_Proxy_Impl (void)
-+{}
-+
-+_TAO_ValueBoxDef_Remote_Proxy_Impl::_TAO_ValueBoxDef_Remote_Proxy_Impl (void)
-+{}
-+
-+// 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_ProvidesDescription *old = ACE_reinterpret_cast (IR_ProvidesDescription *,this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp[i] = old[i];
+@@ -45561,75 +44895,65 @@
+ }
-- void
+ void
- IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_deallocate_buffer (void)
-- {
-- if (this->buffer_ == 0 || this->release_ == 0)
-- return;
--
++ _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;
-- }
-+ IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
-+ IR_IDLType_var _tao_safe_retval (_tao_retval);
++ 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.
-- {
-- this->_deallocate_buffer ();
-- }
-
-+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-+
++ _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::~_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void) // Dtor.
+ {
+ this->_deallocate_buffer ();
+ }
+-
-#endif /* end #if !defined */
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_get_original_type_def",
-+ 22,
-+ 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;
-+ }
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-+ return _tao_safe_retval._retn ();
-+}
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-#if !defined (_IR_PROVIDESDESCSEQ_CS_)
-#define _IR_PROVIDESDESCSEQ_CS_
-+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
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW (CORBA::INTERNAL ());
-
--// *************************************************************
+-
+ // *************************************************************
-// IR::ProvidesDescSeq
--// *************************************************************
-+
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_set_original_type_def",
-+ 22,
-+ 1,
-+ istub->orb_core ()
-+ );
++// IR_ProvidesDescSeq
+ // *************************************************************
-IR::ProvidesDescSeq::ProvidesDescSeq (void)
--{}
++IR_ProvidesDescSeq::IR_ProvidesDescSeq (void)
+ {}
-IR::ProvidesDescSeq::ProvidesDescSeq (CORBA::ULong max) // uses max size
-- :
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-- _TAO_Unbounded_Sequence_IR_ProvidesDescSeq
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
++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 */
-- (max)
--{}
++ 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)
-- :
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-- _TAO_Unbounded_Sequence_IR_ProvidesDescSeq
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
++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 */
-- (max, length, buffer, release)
--{}
++ TAO_Unbounded_Sequence<IR_ProvidesDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
-IR::ProvidesDescSeq::ProvidesDescSeq (const ProvidesDescSeq &seq) // copy ctor
-- :
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-- _TAO_Unbounded_Sequence_IR_ProvidesDescSeq
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
++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 */
-- (seq)
--{}
++ 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);
-- delete tmp;
-+ for (;;)
-+ {
-+ _tao_call.start (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 << original_type_def)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
-+ {
-+ ACE_THROW (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-+ );
-+ }
-+
-+ break;
-+ }
++ IR_ProvidesDescSeq *tmp = ACE_static_cast (IR_ProvidesDescSeq*,x);
+ delete tmp;
}
-
+-
-#endif /* end #if !defined */
-+//
-+// End Base & Remote Proxy Implemeentation.
-+///////////////////////////////////////////////////////////////////////
-+
-
--static const CORBA::Long _oc_IR_ProvidesDescSeq[] =
-+///////////////////////////////////////////////////////////////////////
-+// Remote & Base Proxy Broker Implementation
-+//
-+
-+_TAO_ValueBoxDef_Proxy_Broker::_TAO_ValueBoxDef_Proxy_Broker (void)
+-
+ 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 = ProvidesDescSeq
-- CORBA::tk_sequence, // typecode kind
-- 524, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = ProvidesDescription
-- 5, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
-+}
-
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
-+_TAO_ValueBoxDef_Proxy_Broker::~_TAO_ValueBoxDef_Proxy_Broker (void)
-+{
-+}
-
-- 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
-+// Factory function Implementation.
-+_TAO_ValueBoxDef_Remote_Proxy_Broker *the_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
-+{
-+ static ::_TAO_ValueBoxDef_Remote_Proxy_Broker remote_proxy_broker;
-+ return &remote_proxy_broker;
-+}
-
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
-+_TAO_ValueBoxDef_Remote_Proxy_Broker::_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
-+{
-+}
-
-- 15, ACE_NTOHL (0x696e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x655f7479), ACE_NTOHL (0x70650000), // name = interface_type
-- 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
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -45685,13 +45009,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
-+_TAO_ValueBoxDef_Remote_Proxy_Broker::~_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
-+{
-+}
++ 13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = IR_InterfaceDef
-+_TAO_ValueBoxDef_Proxy_Impl&
-+_TAO_ValueBoxDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_ValueBoxDef *object,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
-+{
-+ ACE_UNUSED_ARG (object);
-+ ACE_UNUSED_ARG (ACE_TRY_ENV);
-+ return remote_proxy_impl_;
-+}
-- 0U,
+ 0U,
--};
+ };
-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)
--TAO_NAMESPACE_END
-+//
-+// End Remote & Base Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
++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)
+@@ -45699,18 +45023,15 @@
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-+
-+// default constructor
-+IR_ValueBoxDef::IR_ValueBoxDef (int collocated)
-+{
-+ this->_tao_setup_collocation (collocated);
-+}
-+
-+// destructor
-+IR_ValueBoxDef::~IR_ValueBoxDef (void)
-+{}
-+
-+void
-+IR_ValueBoxDef::_tao_setup_collocation (int collocated)
-+{
-+ 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 ();
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CS_
-+ IR_TypedefDef::_tao_setup_collocation (collocated);
-+
-+}
-
-- void
+-
+ 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;
-- tmp = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (length);
--
-- if (this->buffer_ != 0)
-+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 ();
-+ if (! obj->_is_local ())
++ 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);
--
-+ 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 ();
- }
-- this->buffer_ = tmp;
-- }
--
-- void
++ IR_UsesDescription *old = ACE_reinterpret_cast (IR_UsesDescription *,this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp[i] = old[i];
+@@ -45723,75 +45044,65 @@
+ }
+
+ void
- IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_deallocate_buffer (void)
-- {
-- if (this->buffer_ == 0 || this->release_ == 0)
-- return;
--
++ _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;
-- }
--
++ 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.
-- {
-- this->_deallocate_buffer ();
-- }
--
++ _TAO_Unbounded_Sequence_IR_UsesDescSeq::~_TAO_Unbounded_Sequence_IR_UsesDescSeq (void) // Dtor.
+ {
+ this->_deallocate_buffer ();
+ }
+
-
-#endif /* end #if !defined */
-+ return IR_ValueBoxDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+}
-
-+IR_ValueBoxDef_ptr IR_ValueBoxDef::_unchecked_narrow (
-+ CORBA::Object_ptr obj,
-+ CORBA::Environment &
-+ )
-+{
-+ 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 ();
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-+ 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
-+ )
-+ )
-+ );
-+}
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-#if !defined (_IR_USESDESCSEQ_CS_)
-#define _IR_USESDESCSEQ_CS_
-+IR_ValueBoxDef_ptr
-+IR_ValueBoxDef::_duplicate (IR_ValueBoxDef_ptr obj)
-+{
-+ if (!CORBA::is_nil (obj))
-+ obj->_add_ref ();
-+ return obj;
-+}
-
--// *************************************************************
+-
+ // *************************************************************
-// IR::UsesDescSeq
--// *************************************************************
-+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);
-+}
++// IR_UsesDescSeq
+ // *************************************************************
-IR::UsesDescSeq::UsesDescSeq (void)
--{}
++IR_UsesDescSeq::IR_UsesDescSeq (void)
+ {}
-IR::UsesDescSeq::UsesDescSeq (CORBA::ULong max) // uses max size
-- :
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-- _TAO_Unbounded_Sequence_IR_UsesDescSeq
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
++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 */
-- (max)
--{}
++ 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)
-- :
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-- _TAO_Unbounded_Sequence_IR_UsesDescSeq
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
++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 */
-- (max, length, buffer, release)
--{}
++ TAO_Unbounded_Sequence<IR_UsesDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
-IR::UsesDescSeq::UsesDescSeq (const UsesDescSeq &seq) // copy ctor
-- :
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-- _TAO_Unbounded_Sequence_IR_UsesDescSeq
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
++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 */
-- (seq)
--{}
++ 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_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 "IDL:omg.org/IR/ValueBoxDef:1.0";
-+}
-+
-+IR_IDLType_ptr IR_ValueBoxDef::original_type_def (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
++void IR_UsesDescSeq::_tao_any_destructor (void *x)
{
- UsesDescSeq *tmp = ACE_static_cast (UsesDescSeq*,x);
-- delete tmp;
-+
-+ return this->the_TAO_ValueBoxDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).original_type_def (
-+ this,
-+ ACE_TRY_ENV
-+ );
++ IR_UsesDescSeq *tmp = ACE_static_cast (IR_UsesDescSeq*,x);
+ delete tmp;
}
-+void IR_ValueBoxDef::original_type_def (
-+ IR_IDLType_ptr original_type_def,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ this->the_TAO_ValueBoxDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).original_type_def (
-+ this,
-+ original_type_def,
-+ ACE_TRY_ENV
-+ );
-+}
-
+-
-#endif /* end #if !defined */
-
--static const CORBA::Long _oc_IR_UsesDescSeq[] =
-+static const CORBA::Long _oc_IR_ValueBoxDef[] =
+ 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 = UsesDescSeq
-- CORBA::tk_sequence, // typecode kind
-- 536, // encapsulation length
-- TAO_ENCAP_BYTE_ORDER, // byte order
-- CORBA::tk_struct, // typecode kind
-- 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 = UsesDescription
-- 6, // member count
-- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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_string,
-- 0U, // string length
--
-- 3, ACE_NTOHL (0x69640000), // name = id
-- CORBA::tk_alias, // typecode kind for typedefs
-- 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 = 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
-- 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 = RepositoryId
-- CORBA::tk_string,
-- 0U, // string length
--
-- 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-- CORBA::tk_alias, // typecode kind for typedefs
-- 64, // encapsulation length
-- 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,
-- 0U, // string length
--
-- 15, ACE_NTOHL (0x696e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x655f7479), ACE_NTOHL (0x70650000), // name = interface_type
-- 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
+@@ -45847,7 +45158,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
--
-- 12, ACE_NTOHL (0x69735f6d), ACE_NTOHL (0x756c7469), ACE_NTOHL (0x706c6500), // name = is_multiple
-- CORBA::tk_boolean,
--
--
-- 0U,
--
-+ 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 = IR_ValueBoxDef
++ 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,
+@@ -45856,7 +45167,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_ValueBoxDef (CORBA::tk_objref, sizeof (_oc_IR_ValueBoxDef), (char *) &_oc_IR_ValueBoxDef, 0, sizeof (IR_ValueBoxDef));
++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)
-+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueBoxDef, &_tc_TAO_tc_IR_ValueBoxDef)
- TAO_NAMESPACE_END
-
- ///////////////////////////////////////////////////////////////////////
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDescSeq, &_tc_TAO_tc_IR_UsesDescSeq)
+@@ -45866,15 +45177,15 @@
// Base & Remote Proxy Implementation.
//
-IR::_TAO_EventDef_Proxy_Impl::_TAO_EventDef_Proxy_Impl (void)
-+_TAO_ProvidesDef_Proxy_Impl::_TAO_ProvidesDef_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_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_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_Object *_collocated_tao_target_,
-- const char * event_id,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- CORBA::Boolean _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,
-- "is_a",
-- 4,
-- 1,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++CORBA::Boolean _TAO_EventDef_Remote_Proxy_Impl::is_a (
+ CORBA_Object *_collocated_tao_target_,
+ const char * event_id,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -45912,7 +45223,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- event_id,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << event_id)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-- _tao_retval
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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))
-- ))
-- {
-- TAO_INTERCEPTOR_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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_retval;
--}
--
++ IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ event_id,
+@@ -46044,7 +45355,7 @@
+ return _tao_retval;
+ }
+
-IR::ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
-+IR_InterfaceDef_ptr _TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
++IR_ValueDef_ptr _TAO_EventDef_Remote_Proxy_Impl::event (
CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
+@@ -46053,8 +45364,8 @@
))
{
- IR::ValueDef_ptr _tao_retval = IR::ValueDef::_nil ();
- IR::ValueDef_var _tao_safe_retval (_tao_retval);
-+ IR_InterfaceDef_ptr _tao_retval = IR_InterfaceDef::_nil ();
-+ IR_InterfaceDef_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 ();
-@@ -45521,143 +23579,53 @@
-
- TAO_GIOP_Twoway_Invocation _tao_call (
- istub,
-- "_get_event",
-- 10,
-+ "_get_interface_type",
-+ 19,
- 0,
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -46082,7 +45393,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -46138,7 +45449,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ 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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ 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)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
- return _tao_safe_retval._retn ();
- }
-
-@@ -45671,32 +23639,32 @@
++ IR_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -46214,37 +45525,37 @@
// Remote & Base Proxy Broker Implementation
//
-IR::_TAO_EventDef_Proxy_Broker::_TAO_EventDef_Proxy_Broker (void)
-+_TAO_ProvidesDef_Proxy_Broker::_TAO_ProvidesDef_Proxy_Broker (void)
++_TAO_EventDef_Proxy_Broker::_TAO_EventDef_Proxy_Broker (void)
{
}
-IR::_TAO_EventDef_Proxy_Broker::~_TAO_EventDef_Proxy_Broker (void)
-+_TAO_ProvidesDef_Proxy_Broker::~_TAO_ProvidesDef_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_ProvidesDef_Remote_Proxy_Broker *the_TAO_ProvidesDef_Remote_Proxy_Broker (void)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_EventDef_Remote_Proxy_Broker *
+-IR::_TAO_EventDef_Remote_Proxy_Broker::the_TAO_EventDef_Remote_Proxy_Broker (void)
++_TAO_EventDef_Remote_Proxy_Broker *
++_TAO_EventDef_Remote_Proxy_Broker::the_TAO_EventDef_Remote_Proxy_Broker (void)
{
- static ::IR::_TAO_EventDef_Remote_Proxy_Broker remote_proxy_broker;
-+ static ::_TAO_ProvidesDef_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_ProvidesDef_Remote_Proxy_Broker::_TAO_ProvidesDef_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_ProvidesDef_Remote_Proxy_Broker::~_TAO_ProvidesDef_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_ProvidesDef_Proxy_Impl&
-+_TAO_ProvidesDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_ProvidesDef *object,
++_TAO_EventDef_Proxy_Impl&
++_TAO_EventDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_EventDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -45712,112 +23680,113 @@
+@@ -46260,109 +45571,109 @@
// default constructor
-IR::EventDef::EventDef (int collocated)
-+IR_ProvidesDef::IR_ProvidesDef (int collocated)
++IR_EventDef::IR_EventDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_EventDef_setup_collocation (collocated);
}
// destructor
-IR::EventDef::~EventDef (void)
-+IR_ProvidesDef::~IR_ProvidesDef (void)
++IR_EventDef::~IR_EventDef (void)
{}
void
--IR::EventDef::_tao_setup_collocation (int collocated)
-+IR_ProvidesDef::_tao_setup_collocation (int collocated)
+-IR::EventDef::IR_EventDef_setup_collocation (int collocated)
++IR_EventDef::IR_EventDef_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_EventDef_Proxy_Broker_ =
+ this->the_TAO_EventDef_Proxy_Broker_ =
- ::IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_ProvidesDef_Proxy_Broker_ =
-+ _TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_EventDef_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_EventDef_Proxy_Broker_ =
+ this->the_TAO_EventDef_Proxy_Broker_ =
- ::IR::_TAO_EventDef_Remote_Proxy_Broker::the_TAO_EventDef_Remote_Proxy_Broker ();
-+ this->the_TAO_ProvidesDef_Proxy_Broker_ =
-+ ::the_TAO_ProvidesDef_Remote_Proxy_Broker ();
-+
-+ IR_Contained::_tao_setup_collocation (collocated);
++ _TAO_EventDef_Remote_Proxy_Broker::the_TAO_EventDef_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (IR, Contained)::_tao_setup_collocation (collocated);
+ this->IR_Contained_setup_collocation (collocated);
}
-void IR::EventDef::_tao_any_destructor (void *x)
-+void IR_ProvidesDef::_tao_any_destructor (void *x)
++void IR_EventDef::_tao_any_destructor (void *x)
{
- EventDef *tmp = ACE_static_cast (EventDef*,x);
-+ IR_ProvidesDef *tmp = ACE_static_cast (IR_ProvidesDef*,x);
++ IR_EventDef *tmp = ACE_static_cast (IR_EventDef*,x);
CORBA::release (tmp);
}
-IR::EventDef_ptr IR::EventDef::_narrow (
-+IR_ProvidesDef_ptr IR_ProvidesDef::_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_ProvidesDef::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EventDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (EventDef::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ProvidesDef:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_ProvidesDef::_nil ());
++ ACE_CHECK_RETURN (IR_EventDef::_nil ());
if (is_a == 0)
- return EventDef::_nil ();
-+ return IR_ProvidesDef::_nil ();
++ return IR_EventDef::_nil ();
}
- return EventDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_ProvidesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_EventDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::EventDef_ptr IR::EventDef::_unchecked_narrow (
-+IR_ProvidesDef_ptr IR_ProvidesDef::_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_ProvidesDef::_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_ProvidesDef_ptr default_proxy = IR_ProvidesDef::_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_ProvidesDef_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_ProvidesDef (
++ ::IR_EventDef (
stub,
1,
obj->_servant ()),
- EventDef::_nil ());
-+ IR_ProvidesDef::_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_ProvidesDef (stub, 0, obj->_servant ()), IR_ProvidesDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_EventDef (stub, 0, obj->_servant ()), IR_EventDef::_nil ());
return default_proxy;
}
else
@@ -58295,14 +24501,14 @@
ACE_reinterpret_cast
(
- EventDef_ptr,
-+ IR_ProvidesDef_ptr,
++ IR_EventDef_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &EventDef::_narrow
-+ &IR_ProvidesDef::_narrow
++ &IR_EventDef::_narrow
)
)
);
@@ -58310,8 +24516,8 @@
-IR::EventDef_ptr
-IR::EventDef::_duplicate (EventDef_ptr obj)
-+IR_ProvidesDef_ptr
-+IR_ProvidesDef::_duplicate (IR_ProvidesDef_ptr obj)
++IR_EventDef_ptr
++IR_EventDef::_duplicate (IR_EventDef_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -58319,26 +24525,22 @@
}
-CORBA::Boolean IR::EventDef::_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)
++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/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")))
-@@ -45826,34 +23795,34 @@
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
+@@ -46374,34 +45685,34 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::EventDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_ProvidesDef::_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_ProvidesDef::_narrow))
++ &IR_EventDef::_narrow))
retv = ACE_reinterpret_cast (void*, this);
else if (type == ACE_reinterpret_cast
(ptr_arith_t,
@@ -58368,536 +24570,325 @@
this
)
);
-@@ -45866,28 +23835,12 @@
+@@ -46414,12 +45725,12 @@
return retv;
}
-const char* IR::EventDef::_interface_repository_id (void) const
-+const char* IR_ProvidesDef::_interface_repository_id (void) const
++const char* IR_EventDef::_interface_repository_id (void) const
{
-- return "IDL:omg.org/IR/EventDef:1.0";
--}
--
+ return "IDL:omg.org/IR/EventDef:1.0";
+ }
+
-CORBA::Boolean IR::EventDef::is_a (
-- const char * event_id,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
-- return this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_a (
-- this,
-- event_id,
-- ACE_TRY_ENV
-- );
-+ return "IDL:omg.org/IR/ProvidesDef:1.0";
++CORBA::Boolean IR_EventDef::is_a (
+ const char * event_id,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -46438,7 +45749,7 @@
+ );
}
-IR::ValueDef_ptr IR::EventDef::event (
-+IR_InterfaceDef_ptr IR_ProvidesDef::interface_type (
++IR_ValueDef_ptr IR_EventDef::event (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -45895,152 +23848,29 @@
- ))
- {
-
-- return this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).event (
-+ return this->the_TAO_ProvidesDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).interface_type (
- this,
- ACE_TRY_ENV
+@@ -46455,9 +45766,8 @@
);
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::TAO_ClientRequestInfo_IR_EventDef_is_a (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * event_id,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- event_id_ (event_id)
--{}
--
--Dynamic::ParameterList *
++IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::TAO_ClientRequestInfo_IR_EventDef_is_a (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * event_id,
+@@ -46468,7 +45778,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_event_id = parameter_list->length ();
-- parameter_list->length (length_event_id + 1);
-- (*parameter_list)[length_event_id].argument <<= event_id_;
-- (*parameter_list)[length_event_id].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -46487,7 +45797,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -46500,7 +45810,7 @@
+
+
+ CORBA::Any *
-IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-- return safe_result_any._retn ();
--}
--
--void
++IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -46516,13 +45826,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::TAO_ClientRequestInfo_IR_EventDef_event_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -46531,7 +45841,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -46543,7 +45853,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -46556,7 +45866,7 @@
+
+
+ CORBA::Any *
-IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -46572,24 +45882,26 @@
+ }
+
+ 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[] =
-+static const CORBA::Long _oc_IR_ProvidesDef[] =
++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
+ 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
-+ 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 = IR_ProvidesDef
++ 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_ProvidesDef (CORBA::tk_objref, sizeof (_oc_IR_ProvidesDef), (char *) &_oc_IR_ProvidesDef, 0, sizeof (IR_ProvidesDef));
++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_DEFINE (CORBA::TypeCode_ptr, _tc_ProvidesDef, &_tc_TAO_tc_IR_ProvidesDef)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EventDef, &_tc_TAO_tc_IR_EventDef)
TAO_NAMESPACE_END
--static const CORBA::Long _oc_IR_EventDescription[] =
+
-+static const CORBA::Long _oc_IR_ProvidesDescription[] =
+ 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 = EventDescription
-+ 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 = ProvidesDescription
- 5, // member count
- 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
- CORBA::tk_alias, // typecode kind for typedefs
-@@ -46078,22 +23908,23 @@
- CORBA::tk_string,
- 0U, // string length
-
-- 6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value
-+ 15, ACE_NTOHL (0x696e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x655f7479), ACE_NTOHL (0x70650000), // name = interface_type
- CORBA::tk_objref, // typecode kind
-- 52, // encapsulation length
-+ 60, // encapsulation length
+@@ -46637,17 +45949,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
+ 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
-+ 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
++ 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_ProvidesDescription (CORBA::tk_struct, sizeof (_oc_IR_ProvidesDescription), (char *) &_oc_IR_ProvidesDescription, 0, sizeof (IR_ProvidesDescription));
++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_DEFINE (CORBA::TypeCode_ptr, _tc_ProvidesDescription, &_tc_TAO_tc_IR_ProvidesDescription)
+ 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_ProvidesDescription::_tao_any_destructor (void *x)
++void IR_EventDescription::_tao_any_destructor (void *x)
{
- EventDescription *tmp = ACE_static_cast (EventDescription*,x);
-+ IR_ProvidesDescription *tmp = ACE_static_cast (IR_ProvidesDescription*,x);
++ IR_EventDescription *tmp = ACE_static_cast (IR_EventDescription*,x);
delete tmp;
}
-@@ -46102,14 +23933,153 @@
+@@ -46656,10 +45969,10 @@
// Base & Remote Proxy Implementation.
//
-IR::_TAO_EmitsDef_Proxy_Impl::_TAO_EmitsDef_Proxy_Impl (void)
-+_TAO_UsesDef_Proxy_Impl::_TAO_UsesDef_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_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Impl (void)
++_TAO_EmitsDef_Remote_Proxy_Impl::_TAO_EmitsDef_Remote_Proxy_Impl (void)
{}
// 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 = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-+
-+
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_get_interface_type",
-+ 19,
-+ 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;
-+ }
-+
-+ return _tao_safe_retval._retn ();
-+}
-+
-+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 = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-+
-+
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_get_is_multiple",
-+ 16,
-+ 0,
-+ istub->orb_core ()
-+ );
-+
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
-+ );
-+ ACE_CHECK_RETURN (_tao_retval);
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ 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),
-+ _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
-+ );
-+ }
-+ break;
-+ }
-+
-+ return _tao_retval;
-+}
-+
-
- //
- // End Base & Remote Proxy Implemeentation.
-@@ -46120,32 +24090,32 @@
+@@ -46674,37 +45987,37 @@
// Remote & Base Proxy Broker Implementation
//
-IR::_TAO_EmitsDef_Proxy_Broker::_TAO_EmitsDef_Proxy_Broker (void)
-+_TAO_UsesDef_Proxy_Broker::_TAO_UsesDef_Proxy_Broker (void)
++_TAO_EmitsDef_Proxy_Broker::_TAO_EmitsDef_Proxy_Broker (void)
{
}
-IR::_TAO_EmitsDef_Proxy_Broker::~_TAO_EmitsDef_Proxy_Broker (void)
-+_TAO_UsesDef_Proxy_Broker::~_TAO_UsesDef_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_UsesDef_Remote_Proxy_Broker *the_TAO_UsesDef_Remote_Proxy_Broker (void)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_EmitsDef_Remote_Proxy_Broker *
+-IR::_TAO_EmitsDef_Remote_Proxy_Broker::the_TAO_EmitsDef_Remote_Proxy_Broker (void)
++_TAO_EmitsDef_Remote_Proxy_Broker *
++_TAO_EmitsDef_Remote_Proxy_Broker::the_TAO_EmitsDef_Remote_Proxy_Broker (void)
{
- static ::IR::_TAO_EmitsDef_Remote_Proxy_Broker remote_proxy_broker;
-+ static ::_TAO_UsesDef_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_UsesDef_Remote_Proxy_Broker::_TAO_UsesDef_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_UsesDef_Remote_Proxy_Broker::~_TAO_UsesDef_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_UsesDef_Proxy_Impl&
-+_TAO_UsesDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_UsesDef *object,
++_TAO_EmitsDef_Proxy_Impl&
++_TAO_EmitsDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_EmitsDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -46161,113 +24131,113 @@
+@@ -46720,109 +46033,109 @@
// default constructor
-IR::EmitsDef::EmitsDef (int collocated)
-+IR_UsesDef::IR_UsesDef (int collocated)
++IR_EmitsDef::IR_EmitsDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_EmitsDef_setup_collocation (collocated);
}
// destructor
-IR::EmitsDef::~EmitsDef (void)
-+IR_UsesDef::~IR_UsesDef (void)
++IR_EmitsDef::~IR_EmitsDef (void)
{}
void
--IR::EmitsDef::_tao_setup_collocation (int collocated)
-+IR_UsesDef::_tao_setup_collocation (int collocated)
+-IR::EmitsDef::IR_EmitsDef_setup_collocation (int collocated)
++IR_EmitsDef::IR_EmitsDef_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_EmitsDef_Proxy_Broker_ =
+ this->the_TAO_EmitsDef_Proxy_Broker_ =
- ::IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_UsesDef_Proxy_Broker_ =
-+ _TAO_UsesDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_EmitsDef_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_EmitsDef_Proxy_Broker_ =
+ this->the_TAO_EmitsDef_Proxy_Broker_ =
- ::IR::_TAO_EmitsDef_Remote_Proxy_Broker::the_TAO_EmitsDef_Remote_Proxy_Broker ();
-+ this->the_TAO_UsesDef_Proxy_Broker_ =
-+ ::the_TAO_UsesDef_Remote_Proxy_Broker ();
-+
-+ IR_Contained::_tao_setup_collocation (collocated);
++ _TAO_EmitsDef_Remote_Proxy_Broker::the_TAO_EmitsDef_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (IR, EventDef)::_tao_setup_collocation (collocated);
+ this->IR_EventDef_setup_collocation (collocated);
}
-void IR::EmitsDef::_tao_any_destructor (void *x)
-+void IR_UsesDef::_tao_any_destructor (void *x)
++void IR_EmitsDef::_tao_any_destructor (void *x)
{
- EmitsDef *tmp = ACE_static_cast (EmitsDef*,x);
-+ IR_UsesDef *tmp = ACE_static_cast (IR_UsesDef*,x);
++ IR_EmitsDef *tmp = ACE_static_cast (IR_EmitsDef*,x);
CORBA::release (tmp);
}
-IR::EmitsDef_ptr IR::EmitsDef::_narrow (
-+IR_UsesDef_ptr IR_UsesDef::_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_UsesDef::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EmitsDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (EmitsDef::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/UsesDef:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_UsesDef::_nil ());
++ ACE_CHECK_RETURN (IR_EmitsDef::_nil ());
if (is_a == 0)
- return EmitsDef::_nil ();
-+ return IR_UsesDef::_nil ();
++ return IR_EmitsDef::_nil ();
}
- return EmitsDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_UsesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_EmitsDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::EmitsDef_ptr IR::EmitsDef::_unchecked_narrow (
-+IR_UsesDef_ptr IR_UsesDef::_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_UsesDef::_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_UsesDef_ptr default_proxy = IR_UsesDef::_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_UsesDef_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_UsesDef (
++ ::IR_EmitsDef (
stub,
1,
obj->_servant ()),
- EmitsDef::_nil ());
-+ IR_UsesDef::_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_UsesDef (stub, 0, obj->_servant ()), IR_UsesDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_EmitsDef (stub, 0, obj->_servant ()), IR_EmitsDef::_nil ());
return default_proxy;
}
else
@@ -58905,14 +24896,14 @@
ACE_reinterpret_cast
(
- EmitsDef_ptr,
-+ IR_UsesDef_ptr,
++ IR_EmitsDef_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &EmitsDef::_narrow
-+ &IR_UsesDef::_narrow
++ &IR_EmitsDef::_narrow
)
)
);
@@ -58920,8 +24911,8 @@
-IR::EmitsDef_ptr
-IR::EmitsDef::_duplicate (EmitsDef_ptr obj)
-+IR_UsesDef_ptr
-+IR_UsesDef::_duplicate (IR_UsesDef_ptr obj)
++IR_EmitsDef_ptr
++IR_EmitsDef::_duplicate (IR_EmitsDef_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -58929,42 +24920,39 @@
}
-CORBA::Boolean IR::EmitsDef::_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)
++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")) ||
-- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
-+ (!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")))
-@@ -46276,46 +24246,34 @@
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EmitsDef:1.0")) ||
+@@ -46835,46 +46148,46 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::EmitsDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_UsesDef::_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_UsesDef::_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))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_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
@@ -58991,956 +24979,468 @@
this
)
);
-@@ -46328,288 +24286,579 @@
+@@ -46887,21 +46200,18 @@
return retv;
}
-const char* IR::EmitsDef::_interface_repository_id (void) const
-+const char* IR_UsesDef::_interface_repository_id (void) const
++const char* IR_EmitsDef::_interface_repository_id (void) const
{
-- return "IDL:omg.org/IR/EmitsDef:1.0";
-+ return "IDL:omg.org/IR/UsesDef:1.0";
+ return "IDL:omg.org/IR/EmitsDef:1.0";
}
-+IR_InterfaceDef_ptr IR_UsesDef::interface_type (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ return this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).interface_type (
-+ this,
-+ ACE_TRY_ENV
-+ );
-+}
-
+-
-#if (TAO_HAS_INTERCEPTORS == 1)
-#endif /* TAO_HAS_INTERCEPTORS */
--static const CORBA::Long _oc_IR_EmitsDef[] =
-+CORBA::Boolean IR_UsesDef::is_multiple (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ return this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_multiple (
-+ this,
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+static const CORBA::Long _oc_IR_UsesDef[] =
+ 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
+ 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
-+ 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 = IR_UsesDef
++ 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_UsesDef (CORBA::tk_objref, sizeof (_oc_IR_UsesDef), (char *) &_oc_IR_UsesDef, 0, sizeof (IR_UsesDef));
++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_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDef, &_tc_TAO_tc_IR_UsesDef)
- TAO_NAMESPACE_END
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EmitsDef, &_tc_TAO_tc_IR_EmitsDef)
+@@ -46911,10 +46221,10 @@
+ // Base & Remote Proxy Implementation.
+ //
--///////////////////////////////////////////////////////////////////////
--// Base & Remote Proxy Implementation.
--//
--
-IR::_TAO_PublishesDef_Proxy_Impl::_TAO_PublishesDef_Proxy_Impl (void)
--{}
-+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 = UsesDescription
-+ 6, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
++_TAO_PublishesDef_Proxy_Impl::_TAO_PublishesDef_Proxy_Impl (void)
+ {}
-IR::_TAO_PublishesDef_Remote_Proxy_Impl::_TAO_PublishesDef_Remote_Proxy_Impl (void)
--{}
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
--// Remote Implementation of the IDL interface methods
-+ 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
-
--//
--// End Base & Remote Proxy Implemeentation.
--///////////////////////////////////////////////////////////////////////
-+ 15, ACE_NTOHL (0x696e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x655f7479), ACE_NTOHL (0x70650000), // name = interface_type
-+ 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
-
-+ 12, ACE_NTOHL (0x69735f6d), ACE_NTOHL (0x756c7469), ACE_NTOHL (0x706c6500), // name = is_multiple
-+ CORBA::tk_boolean,
++_TAO_PublishesDef_Remote_Proxy_Impl::_TAO_PublishesDef_Remote_Proxy_Impl (void)
+ {}
--///////////////////////////////////////////////////////////////////////
--// Remote & Base Proxy Broker Implementation
--//
-+};
-+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
+ // Remote Implementation of the IDL interface methods
+@@ -46929,37 +46239,37 @@
+ // Remote & Base Proxy Broker Implementation
+ //
-IR::_TAO_PublishesDef_Proxy_Broker::_TAO_PublishesDef_Proxy_Broker (void)
-+void IR_UsesDescription::_tao_any_destructor (void *x)
++_TAO_PublishesDef_Proxy_Broker::_TAO_PublishesDef_Proxy_Broker (void)
{
-+ IR_UsesDescription *tmp = ACE_static_cast (IR_UsesDescription*,x);
-+ delete tmp;
}
-IR::_TAO_PublishesDef_Proxy_Broker::~_TAO_PublishesDef_Proxy_Broker (void)
--{
--}
-+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-+
-+ 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 /* !TAO_USE_SEQUENCE_TEMPLATES */
-+
-+// *************************************************************
-+// IR_ProvidesDescSeq
-+// *************************************************************
++_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)
-+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 */
-+ (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 */
-+ (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 */
-+ (seq)
-+{}
-+IR_ProvidesDescSeq::~IR_ProvidesDescSeq (void) // dtor
-+{}
-+void IR_ProvidesDescSeq::_tao_any_destructor (void *x)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_PublishesDef_Remote_Proxy_Broker *
+-IR::_TAO_PublishesDef_Remote_Proxy_Broker::the_TAO_PublishesDef_Remote_Proxy_Broker (void)
++_TAO_PublishesDef_Remote_Proxy_Broker *
++_TAO_PublishesDef_Remote_Proxy_Broker::the_TAO_PublishesDef_Remote_Proxy_Broker (void)
{
- static ::IR::_TAO_PublishesDef_Remote_Proxy_Broker remote_proxy_broker;
-- return &remote_proxy_broker;
-+ IR_ProvidesDescSeq *tmp = ACE_static_cast (IR_ProvidesDescSeq*,x);
-+ delete tmp;
++ 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)
-+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 = ProvidesDescSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 524, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = ProvidesDescription
-+ 5, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
++_TAO_PublishesDef_Remote_Proxy_Broker::_TAO_PublishesDef_Remote_Proxy_Broker (void)
+ {
+ }
-IR::_TAO_PublishesDef_Remote_Proxy_Broker::~_TAO_PublishesDef_Remote_Proxy_Broker (void)
--{
--}
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
++_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,
-- CORBA::Environment &ACE_TRY_ENV
--)
--{
-- ACE_UNUSED_ARG (object);
-- ACE_UNUSED_ARG (ACE_TRY_ENV);
-- return remote_proxy_impl_;
--}
-+ 11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
-
--//
--// End Remote & Base Proxy Broker Implementation
--///////////////////////////////////////////////////////////////////////
-+ 15, ACE_NTOHL (0x696e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x655f7479), ACE_NTOHL (0x70650000), // name = interface_type
-+ 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
++_TAO_PublishesDef_Proxy_Impl&
++_TAO_PublishesDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_PublishesDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -46975,109 +46285,109 @@
--// default constructor
+ // default constructor
-IR::PublishesDef::PublishesDef (int collocated)
--{
-- this->_tao_setup_collocation (collocated);
--}
-+ 0U,
++IR_PublishesDef::IR_PublishesDef (int collocated)
+ {
+ this->IR_PublishesDef_setup_collocation (collocated);
+ }
--// destructor
+ // destructor
-IR::PublishesDef::~PublishesDef (void)
--{}
-+};
-+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)
-+TAO_NAMESPACE_END
++IR_PublishesDef::~IR_PublishesDef (void)
+ {}
--void
--IR::PublishesDef::_tao_setup_collocation (int collocated)
--{
-- if (collocated)
-- this->the_TAO_PublishesDef_Proxy_Broker_ =
+ void
+-IR::PublishesDef::IR_PublishesDef_setup_collocation (int collocated)
++IR_PublishesDef::IR_PublishesDef_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_PublishesDef_Proxy_Broker_ =
- ::IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer (this);
-- else
-- this->the_TAO_PublishesDef_Proxy_Broker_ =
++ _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 ();
-+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++ _TAO_PublishesDef_Remote_Proxy_Broker::the_TAO_PublishesDef_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (IR, EventDef)::_tao_setup_collocation (collocated);
--}
--
+ this->IR_EventDef_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);
-- CORBA::release (tmp);
--}
--
++ IR_PublishesDef *tmp = ACE_static_cast (IR_PublishesDef*,x);
+ CORBA::release (tmp);
+ }
+
-IR::PublishesDef_ptr IR::PublishesDef::_narrow (
-- CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV
-- )
--{
-- if (CORBA::is_nil (obj))
++IR_PublishesDef_ptr IR_PublishesDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
- return PublishesDef::_nil ();
-- if (! obj->_is_local ())
-+ 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)
++ 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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PublishesDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (PublishesDef::_nil ());
-- if (is_a == 0)
++ ACE_CHECK_RETURN (IR_PublishesDef::_nil ());
+ if (is_a == 0)
- return PublishesDef::_nil ();
-+ 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);
-+
++ 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 (
-- CORBA::Object_ptr obj,
-- CORBA::Environment &
-- )
--{
-- if (CORBA::is_nil (obj))
++IR_PublishesDef_ptr IR_PublishesDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
- return PublishesDef::_nil ();
-- if (! obj->_is_local ())
-- {
-- TAO_Stub* stub = obj->_stubobj ();
-- if (stub)
-- stub->_incr_refcnt ();
++ return IR_PublishesDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
- PublishesDef_ptr default_proxy = PublishesDef::_nil ();
--
-- if (
-- !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-- stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
++ 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
-- )
-- {
-- ACE_NEW_RETURN (
-- default_proxy,
++ obj->_is_collocated () &&_TAO_PublishesDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
- ::IR::PublishesDef (
-- stub,
-- 1,
-- obj->_servant ()),
--
++ ::IR_PublishesDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
- PublishesDef::_nil ());
-- }
-- if (CORBA::is_nil (default_proxy))
++ IR_PublishesDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, ::IR::PublishesDef (stub, 0, obj->_servant ()), PublishesDef::_nil ());
-- return default_proxy;
-- }
-- else
-- return
-- ACE_reinterpret_cast
-- (
++ ACE_NEW_RETURN (default_proxy, ::IR_PublishesDef (stub, 0, obj->_servant ()), IR_PublishesDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
- PublishesDef_ptr,
-- obj->_tao_QueryInterface
-- (
-- ACE_reinterpret_cast
-- (
-- ptr_arith_t,
++ 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)
--{
-- if (!CORBA::is_nil (obj))
-- obj->_add_ref ();
-- return 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)
--{
-- if (
-- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PublishesDef:1.0")) ||
-- (!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);
--}
--
++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")) ||
+@@ -47090,46 +46400,46 @@
+ 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,
++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))
-- retv = ACE_reinterpret_cast (void*, this);
-- else 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,
- &ACE_NESTED_CLASS (::IR, EventDef)::_narrow))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_EventDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_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::_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));
-+ this->buffer_ = tmp;
-+ }
-+
-+ void
-+ _TAO_Unbounded_Sequence_IR_UsesDescSeq::_deallocate_buffer (void)
-+ {
-+ if (this->buffer_ == 0 || this->release_ == 0)
-+ return;
-
-- if (retv)
-- this->_add_ref ();
-- return retv;
--}
-+ 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 /* !TAO_USE_SEQUENCE_TEMPLATES */
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -47142,21 +46452,18 @@
+ return retv;
+ }
-const char* IR::PublishesDef::_interface_repository_id (void) const
-+// *************************************************************
-+// IR_UsesDescSeq
-+// *************************************************************
-+
-+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 */
-+ (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 */
-+ (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 */
-+ (seq)
-+{}
-+IR_UsesDescSeq::~IR_UsesDescSeq (void) // dtor
-+{}
-+void IR_UsesDescSeq::_tao_any_destructor (void *x)
++const char* IR_PublishesDef::_interface_repository_id (void) const
{
-- return "IDL:omg.org/IR/PublishesDef:1.0";
-+ IR_UsesDescSeq *tmp = ACE_static_cast (IR_UsesDescSeq*,x);
-+ delete tmp;
+ return "IDL:omg.org/IR/PublishesDef:1.0";
}
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-#endif /* TAO_HAS_INTERCEPTORS */
--static const CORBA::Long _oc_IR_PublishesDef[] =
-+static const CORBA::Long _oc_IR_UsesDescSeq[] =
+ 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
+ 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
-+ 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 = UsesDescSeq
-+ CORBA::tk_sequence, // typecode kind
-+ 536, // encapsulation length
-+ TAO_ENCAP_BYTE_ORDER, // byte order
-+ CORBA::tk_struct, // typecode kind
-+ 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 = UsesDescription
-+ 6, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-+
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = 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
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-+
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
-+
-+ 15, ACE_NTOHL (0x696e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x655f7479), ACE_NTOHL (0x70650000), // name = interface_type
-+ 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
-+
-+ 12, ACE_NTOHL (0x69735f6d), ACE_NTOHL (0x756c7469), ACE_NTOHL (0x706c6500), // name = is_multiple
-+ CORBA::tk_boolean,
-+
-+
-+ 0U,
-+
++ 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_UsesDescSeq (CORBA::tk_alias, sizeof (_oc_IR_UsesDescSeq), (char *) &_oc_IR_UsesDescSeq, 0, sizeof (IR_UsesDescSeq));
++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_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDescSeq, &_tc_TAO_tc_IR_UsesDescSeq)
- TAO_NAMESPACE_END
-
- ///////////////////////////////////////////////////////////////////////
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PublishesDef, &_tc_TAO_tc_IR_PublishesDef)
+@@ -47166,10 +46473,10 @@
// Base & Remote Proxy Implementation.
//
-IR::_TAO_ConsumesDef_Proxy_Impl::_TAO_ConsumesDef_Proxy_Impl (void)
-+_TAO_EventDef_Proxy_Impl::_TAO_EventDef_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_EventDef_Remote_Proxy_Impl::_TAO_EventDef_Remote_Proxy_Impl (void)
++_TAO_ConsumesDef_Remote_Proxy_Impl::_TAO_ConsumesDef_Remote_Proxy_Impl (void)
{}
// 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
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ CORBA::Boolean _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,
-+ "is_a",
-+ 4,
-+ 1,
-+ istub->orb_core ()
-+ );
-+
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
-+ );
-+ 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
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ 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),
-+ _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
-+ );
-+ }
-+ break;
-+ }
-+
-+ return _tao_retval;
-+}
-+
-+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 = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-+
-+
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_get_event",
-+ 10,
-+ 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;
-+ }
-+
-+ return _tao_safe_retval._retn ();
-+}
-+
-
- //
- // End Base & Remote Proxy Implemeentation.
-@@ -46620,32 +24869,32 @@
+@@ -47184,37 +46491,37 @@
// Remote & Base Proxy Broker Implementation
//
-IR::_TAO_ConsumesDef_Proxy_Broker::_TAO_ConsumesDef_Proxy_Broker (void)
-+_TAO_EventDef_Proxy_Broker::_TAO_EventDef_Proxy_Broker (void)
++_TAO_ConsumesDef_Proxy_Broker::_TAO_ConsumesDef_Proxy_Broker (void)
{
}
-IR::_TAO_ConsumesDef_Proxy_Broker::~_TAO_ConsumesDef_Proxy_Broker (void)
-+_TAO_EventDef_Proxy_Broker::~_TAO_EventDef_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_EventDef_Remote_Proxy_Broker *the_TAO_EventDef_Remote_Proxy_Broker (void)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_ConsumesDef_Remote_Proxy_Broker *
+-IR::_TAO_ConsumesDef_Remote_Proxy_Broker::the_TAO_ConsumesDef_Remote_Proxy_Broker (void)
++_TAO_ConsumesDef_Remote_Proxy_Broker *
++_TAO_ConsumesDef_Remote_Proxy_Broker::the_TAO_ConsumesDef_Remote_Proxy_Broker (void)
{
- static ::IR::_TAO_ConsumesDef_Remote_Proxy_Broker remote_proxy_broker;
-+ static ::_TAO_EventDef_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_EventDef_Remote_Proxy_Broker::_TAO_EventDef_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_EventDef_Remote_Proxy_Broker::~_TAO_EventDef_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_EventDef_Proxy_Impl&
-+_TAO_EventDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_EventDef *object,
++_TAO_ConsumesDef_Proxy_Impl&
++_TAO_ConsumesDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_ConsumesDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -46661,112 +24910,112 @@
+@@ -47230,109 +46537,109 @@
// default constructor
-IR::ConsumesDef::ConsumesDef (int collocated)
-+IR_EventDef::IR_EventDef (int collocated)
++IR_ConsumesDef::IR_ConsumesDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_ConsumesDef_setup_collocation (collocated);
}
// destructor
-IR::ConsumesDef::~ConsumesDef (void)
-+IR_EventDef::~IR_EventDef (void)
++IR_ConsumesDef::~IR_ConsumesDef (void)
{}
void
--IR::ConsumesDef::_tao_setup_collocation (int collocated)
-+IR_EventDef::_tao_setup_collocation (int collocated)
+-IR::ConsumesDef::IR_ConsumesDef_setup_collocation (int collocated)
++IR_ConsumesDef::IR_ConsumesDef_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_ConsumesDef_Proxy_Broker_ =
+ this->the_TAO_ConsumesDef_Proxy_Broker_ =
- ::IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_EventDef_Proxy_Broker_ =
-+ _TAO_EventDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_ConsumesDef_Proxy_Broker_ =
+ this->the_TAO_ConsumesDef_Proxy_Broker_ =
- ::IR::_TAO_ConsumesDef_Remote_Proxy_Broker::the_TAO_ConsumesDef_Remote_Proxy_Broker ();
-+ this->the_TAO_EventDef_Proxy_Broker_ =
-+ ::the_TAO_EventDef_Remote_Proxy_Broker ();
-+
-+ IR_Contained::_tao_setup_collocation (collocated);
++ _TAO_ConsumesDef_Remote_Proxy_Broker::the_TAO_ConsumesDef_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (IR, EventDef)::_tao_setup_collocation (collocated);
+ this->IR_EventDef_setup_collocation (collocated);
}
-void IR::ConsumesDef::_tao_any_destructor (void *x)
-+void IR_EventDef::_tao_any_destructor (void *x)
++void IR_ConsumesDef::_tao_any_destructor (void *x)
{
- ConsumesDef *tmp = ACE_static_cast (ConsumesDef*,x);
-+ IR_EventDef *tmp = ACE_static_cast (IR_EventDef*,x);
++ IR_ConsumesDef *tmp = ACE_static_cast (IR_ConsumesDef*,x);
CORBA::release (tmp);
}
-IR::ConsumesDef_ptr IR::ConsumesDef::_narrow (
-+IR_EventDef_ptr IR_EventDef::_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_EventDef::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ConsumesDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (ConsumesDef::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EventDef:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_EventDef::_nil ());
++ ACE_CHECK_RETURN (IR_ConsumesDef::_nil ());
if (is_a == 0)
- return ConsumesDef::_nil ();
-+ return IR_EventDef::_nil ();
++ return IR_ConsumesDef::_nil ();
}
- return ConsumesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_EventDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_ConsumesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::ConsumesDef_ptr IR::ConsumesDef::_unchecked_narrow (
-+IR_EventDef_ptr IR_EventDef::_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_EventDef::_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_EventDef_ptr default_proxy = IR_EventDef::_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_EventDef_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_EventDef (
++ ::IR_ConsumesDef (
stub,
1,
obj->_servant ()),
- ConsumesDef::_nil ());
-+ IR_EventDef::_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_EventDef (stub, 0, obj->_servant ()), IR_EventDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_ConsumesDef (stub, 0, obj->_servant ()), IR_ConsumesDef::_nil ());
return default_proxy;
}
else
@@ -59948,14 +25448,14 @@
ACE_reinterpret_cast
(
- ConsumesDef_ptr,
-+ IR_EventDef_ptr,
++ IR_ConsumesDef_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &ConsumesDef::_narrow
-+ &IR_EventDef::_narrow
++ &IR_ConsumesDef::_narrow
)
)
);
@@ -59963,8 +25463,8 @@
-IR::ConsumesDef_ptr
-IR::ConsumesDef::_duplicate (ConsumesDef_ptr obj)
-+IR_EventDef_ptr
-+IR_EventDef::_duplicate (IR_EventDef_ptr obj)
++IR_ConsumesDef_ptr
++IR_ConsumesDef::_duplicate (IR_ConsumesDef_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -59972,40 +25472,39 @@
}
-CORBA::Boolean IR::ConsumesDef::_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)
++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")) ||
- (!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")) ||
-@@ -46776,46 +25025,34 @@
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ConsumesDef:1.0")) ||
+@@ -47345,46 +46652,46 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::ConsumesDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_EventDef::_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_EventDef::_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))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_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
@@ -60032,3052 +25531,778 @@
this
)
);
-@@ -46828,2382 +25065,624 @@
+@@ -47397,21 +46704,18 @@
return retv;
}
-const char* IR::ConsumesDef::_interface_repository_id (void) const
--{
-- return "IDL:omg.org/IR/ConsumesDef:1.0";
--}
-+const char* IR_EventDef::_interface_repository_id (void) const
-+{
-+ return "IDL:omg.org/IR/EventDef:1.0";
-+}
-+
-+CORBA::Boolean IR_EventDef::is_a (
-+ const char * event_id,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ return this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_a (
-+ this,
-+ event_id,
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+IR_ValueDef_ptr IR_EventDef::event (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-+
-+ return this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).event (
-+ this,
-+ ACE_TRY_ENV
-+ );
-+}
-+
-+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 = 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
-+ 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 = EventDescription
-+ 5, // member count
-+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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_string,
-+ 0U, // string length
-+
-+ 3, ACE_NTOHL (0x69640000), // name = id
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 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 = 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
-+ 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 = RepositoryId
-+ CORBA::tk_string,
-+ 0U, // string length
-+
-+ 8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
-+ CORBA::tk_alias, // typecode kind for typedefs
-+ 64, // encapsulation length
-+ 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,
-+ 0U, // string length
-+
-+ 6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value
-+ CORBA::tk_objref, // typecode kind
-+ 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 = IR_ValueDef
++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
+ 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_EventDescription (CORBA::tk_struct, sizeof (_oc_IR_EventDescription), (char *) &_oc_IR_EventDescription, 0, sizeof (IR_EventDescription));
++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)
-+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;
-+}
-+
-+
- ///////////////////////////////////////////////////////////////////////
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConsumesDef, &_tc_TAO_tc_IR_ConsumesDef)
+@@ -47421,15 +46725,15 @@
// Base & Remote Proxy Implementation.
//
-IR::_TAO_ComponentDef_Proxy_Impl::_TAO_ComponentDef_Proxy_Impl (void)
-+_TAO_EmitsDef_Proxy_Impl::_TAO_EmitsDef_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_EmitsDef_Remote_Proxy_Impl::_TAO_EmitsDef_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 (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
++IR_InterfaceDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -47438,7 +46742,7 @@
+ ))
+ {
+
- IR::InterfaceDefSeq *_tao_retval = 0;
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
++ IR_InterfaceDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -47446,8 +46750,8 @@
+ 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 (
-- istub,
-- "_get_supported_interfaces",
-- 25,
-- 0,
-- istub->orb_core ()
-- );
-+//
-+// End Base & Remote Proxy Implemeentation.
-+///////////////////////////////////////////////////////////////////////
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ 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",
+@@ -47468,7 +46772,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -47524,7 +46828,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
--}
-+///////////////////////////////////////////////////////////////////////
-+// Remote & Base Proxy Broker Implementation
-+//
++ IR_InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -47590,19 +46894,15 @@
+ return _tao_safe_retval._retn ();
+ }
-void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
-- CORBA_Object *_collocated_tao_target_,
++void _TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
- const IR::InterfaceDefSeq & supported_interfaces,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+_TAO_EmitsDef_Proxy_Broker::_TAO_EmitsDef_Proxy_Broker (void)
++ 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 ());
--
--
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_set_supported_interfaces",
-- 25,
-- 1,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -47628,7 +46928,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- supported_interfaces,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK;
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK;
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << supported_interfaces)
-- ))
-- TAO_INTERCEPTOR_THROW (
-- CORBA::MARSHAL ()
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK;
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_THROW (
-- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-- );
--
-- }
--
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK;
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK;
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
--
++ IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ supported_interfaces,
+@@ -47742,7 +47042,7 @@
+
}
-IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+_TAO_EmitsDef_Proxy_Broker::~_TAO_EmitsDef_Proxy_Broker (void)
++IR_ComponentDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::base_component (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -47751,8 +47051,8 @@
+ ))
{
--
+
- 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,
-- "_get_base_component",
-- 19,
-- 0,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ IR_ComponentDef_ptr _tao_retval = IR_ComponentDef::_nil ();
++ IR_ComponentDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -47780,7 +47080,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -47836,7 +47136,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
++ IR_ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -47902,7 +47202,7 @@
+ return _tao_safe_retval._retn ();
}
-IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interfaces (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+// Factory function Implementation.
-+_TAO_EmitsDef_Remote_Proxy_Broker *the_TAO_EmitsDef_Remote_Proxy_Broker (void)
++IR_ProvidesDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::provides_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -47911,7 +47211,7 @@
+ ))
{
--
+
- IR::ProvidesDefSeq *_tao_retval = 0;
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-+ static ::_TAO_EmitsDef_Remote_Proxy_Broker remote_proxy_broker;
-+ return &remote_proxy_broker;
-+}
++ IR_ProvidesDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -47919,8 +47219,8 @@
+ 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 (
-- istub,
-- "_get_provides_interfaces",
-- 24,
-- 0,
-- istub->orb_core ()
-- );
-+_TAO_EmitsDef_Remote_Proxy_Broker::_TAO_EmitsDef_Remote_Proxy_Broker (void)
-+{
-+}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ 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",
+@@ -47941,7 +47241,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -47997,7 +47297,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::ProvidesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+_TAO_EmitsDef_Remote_Proxy_Broker::~_TAO_EmitsDef_Remote_Proxy_Broker (void)
-+{
-+}
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
-+_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_;
++ IR_ProvidesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -48063,7 +47363,7 @@
+ return _tao_safe_retval._retn ();
}
-IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+
-+//
-+// End Remote & Base Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-+
-+// default constructor
-+IR_EmitsDef::IR_EmitsDef (int collocated)
++IR_UsesDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -48072,7 +47372,7 @@
+ ))
{
--
+
- IR::UsesDefSeq *_tao_retval = 0;
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-+ this->_tao_setup_collocation (collocated);
-+}
++ IR_UsesDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -48080,8 +47380,8 @@
+ 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 (
-- istub,
-- "_get_uses_interfaces",
-- 20,
-- 0,
-- istub->orb_core ()
-- );
-+// destructor
-+IR_EmitsDef::~IR_EmitsDef (void)
-+{}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-+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 ();
-
--#endif /* TAO_HAS_INTERCEPTORS */
-+ IR_EventDef::_tao_setup_collocation (collocated);
-
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ 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",
+@@ -48102,7 +47402,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -48158,7 +47458,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::UsesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+}
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
-+void IR_EmitsDef::_tao_any_destructor (void *x)
-+{
-+ IR_EmitsDef *tmp = ACE_static_cast (IR_EmitsDef*,x);
-+ CORBA::release (tmp);
++ IR_UsesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -48224,7 +47524,7 @@
+ return _tao_safe_retval._retn ();
}
-IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
-- CORBA_Object *_collocated_tao_target_,
-+IR_EmitsDef_ptr IR_EmitsDef::_narrow (
-+ CORBA::Object_ptr obj,
++IR_EmitsDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
+@@ -48233,7 +47533,7 @@
+ ))
{
--
+
- IR::EmitsDefSeq *_tao_retval = 0;
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
--
--
++ IR_EmitsDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -48241,8 +47541,8 @@
+ 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 (
-- istub,
-- "_get_emits_events",
-- 17,
-- 0,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-+ if (CORBA::is_nil (obj))
-+ return IR_EmitsDef::_nil ();
-+ if (! obj->_is_local ())
- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ 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",
+@@ -48263,7 +47563,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -48319,7 +47619,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::EmitsDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-+ 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 _tao_safe_retval._retn ();
-+ return IR_EmitsDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ IR_EmitsDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -48385,7 +47685,7 @@
+ return _tao_safe_retval._retn ();
}
-IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-+IR_EmitsDef_ptr IR_EmitsDef::_unchecked_narrow (
-+ CORBA::Object_ptr obj,
-+ CORBA::Environment &
++IR_PublishesDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::publishes_events (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
+@@ -48394,7 +47694,7 @@
+ ))
{
--
+
- IR::PublishesDefSeq *_tao_retval = 0;
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
--
--
++ IR_PublishesDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -48402,8 +47702,8 @@
+ 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 (
-- istub,
-- "_get_publishes_events",
-- 21,
-- 0,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-+ if (CORBA::is_nil (obj))
-+ return IR_EmitsDef::_nil ();
-+ if (! obj->_is_local ())
- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ 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",
+@@ -48424,7 +47724,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -48480,7 +47780,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::PublishesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-+ 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 ()),
-
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-+ IR_EmitsDef::_nil ());
- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-+ 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
-+ )
-+ )
- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
++ IR_PublishesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -48546,7 +47846,7 @@
+ return _tao_safe_retval._retn ();
}
-IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+IR_EmitsDef_ptr
-+IR_EmitsDef::_duplicate (IR_EmitsDef_ptr obj)
++IR_ConsumesDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -48555,7 +47855,7 @@
+ ))
{
--
+
- IR::ConsumesDefSeq *_tao_retval = 0;
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-+ if (!CORBA::is_nil (obj))
-+ obj->_add_ref ();
-+ return obj;
-+}
++ IR_ConsumesDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -48563,8 +47863,8 @@
+ 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 (
-- istub,
-- "_get_consumes_events",
-- 20,
-- 0,
-- istub->orb_core ()
-- );
-+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")) ||
-+ (!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);
-+}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ 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",
+@@ -48585,7 +47885,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -48641,7 +47941,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::ConsumesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+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;
-+}
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
-+const char* IR_EmitsDef::_interface_repository_id (void) const
-+{
-+ return "IDL:omg.org/IR/EmitsDef:1.0";
++ IR_ConsumesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -48707,7 +48007,7 @@
+ return _tao_safe_retval._retn ();
}
-CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+static const CORBA::Long _oc_IR_EmitsDef[] =
- {
--
-- CORBA::Boolean _tao_retval = 0;
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-+ 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_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "_get_is_basic",
-- 13,
-- 0,
-- istub->orb_core ()
-- );
-+///////////////////////////////////////////////////////////////////////
-+// Base & Remote Proxy Implementation.
-+//
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++CORBA::Boolean _TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -48744,7 +48044,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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))
-- ))
-- {
-- TAO_INTERCEPTOR_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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+_TAO_PublishesDef_Proxy_Impl::_TAO_PublishesDef_Proxy_Impl (void)
-+{}
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_retval;
--}
-+_TAO_PublishesDef_Remote_Proxy_Impl::_TAO_PublishesDef_Remote_Proxy_Impl (void)
-+{}
++ IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -48865,12 +48165,12 @@
+ return _tao_retval;
+ }
-IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++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,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
--{
--
++ IR_InterfaceDef_ptr interface_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -48878,8 +48178,8 @@
+ ))
+ {
+
- IR::ProvidesDef_ptr _tao_retval = IR::ProvidesDef::_nil ();
- IR::ProvidesDef_var _tao_safe_retval (_tao_retval);
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-+// Remote Implementation of the IDL interface methods
-
--
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "create_provides",
-- 15,
-- 1,
-- istub->orb_core ()
-- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ IR_ProvidesDef_ptr _tao_retval = IR_ProvidesDef::_nil ();
++ IR_ProvidesDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -48907,7 +48207,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- name,
-- version,
-- interface_type,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-- (_tao_out << name) &&
-- (_tao_out << version) &&
-- (_tao_out << interface_type)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-- 0
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -48980,7 +48280,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+//
-+// End Base & Remote Proxy Implemeentation.
-+///////////////////////////////////////////////////////////////////////
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
-+
-+///////////////////////////////////////////////////////////////////////
-+// Remote & Base Proxy Broker Implementation
-+//
-+
-+_TAO_PublishesDef_Proxy_Broker::_TAO_PublishesDef_Proxy_Broker (void)
-+{
++ IR_ProvidesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -49046,12 +48346,12 @@
+ return _tao_safe_retval._retn ();
}
-IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++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,
-- CORBA::Boolean is_multiple,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+_TAO_PublishesDef_Proxy_Broker::~_TAO_PublishesDef_Proxy_Broker (void)
++ IR_InterfaceDef_ptr interface_type,
+ CORBA::Boolean is_multiple,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -49060,8 +48360,8 @@
+ ))
{
--
+
- IR::UsesDef_ptr _tao_retval = IR::UsesDef::_nil ();
- IR::UsesDef_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_uses",
-- 11,
-- 1,
-- istub->orb_core ()
-- );
-+// 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;
-+}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ IR_UsesDef_ptr _tao_retval = IR_UsesDef::_nil ();
++ IR_UsesDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -49089,7 +48389,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- name,
-- version,
-- interface_type,
-- is_multiple,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-- (_tao_out << name) &&
-- (_tao_out << version) &&
-- (_tao_out << interface_type) &&
-- (_tao_out << CORBA::Any::from_boolean (is_multiple))
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-- 0
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -49164,7 +48464,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+_TAO_PublishesDef_Remote_Proxy_Broker::_TAO_PublishesDef_Remote_Proxy_Broker (void)
-+{
-+}
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
-+_TAO_PublishesDef_Remote_Proxy_Broker::~_TAO_PublishesDef_Remote_Proxy_Broker (void)
-+{
++ IR_UsesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -49230,12 +48530,12 @@
+ return _tao_safe_retval._retn ();
}
-IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++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,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
-+_TAO_PublishesDef_Proxy_Impl&
-+_TAO_PublishesDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_PublishesDef *object,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -49243,8 +48543,8 @@
+ ))
{
--
+
- IR::EmitsDef_ptr _tao_retval = IR::EmitsDef::_nil ();
- IR::EmitsDef_var _tao_safe_retval (_tao_retval);
--
--
-- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-- if (istub == 0)
-- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-+ ACE_UNUSED_ARG (object);
-+ ACE_UNUSED_ARG (ACE_TRY_ENV);
-+ return remote_proxy_impl_;
-+}
-+
-+
-+//
-+// End Remote & Base Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-+
-
--
-- TAO_GIOP_Twoway_Invocation _tao_call (
-- istub,
-- "create_emits",
-- 12,
-- 1,
-- istub->orb_core ()
-- );
-+// default constructor
-+IR_PublishesDef::IR_PublishesDef (int collocated)
-+{
-+ this->_tao_setup_collocation (collocated);
-+}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
-+// destructor
-+IR_PublishesDef::~IR_PublishesDef (void)
-+{}
-+
-+void
-+IR_PublishesDef::_tao_setup_collocation (int collocated)
-+{
-+ 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_EmitsDef_ptr _tao_retval = IR_EmitsDef::_nil ();
++ IR_EmitsDef_var _tao_safe_retval (_tao_retval);
--#endif /* TAO_HAS_INTERCEPTORS */
-+ IR_EventDef::_tao_setup_collocation (collocated);
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -49272,7 +48572,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- name,
-- version,
-- value,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-- (_tao_out << name) &&
-- (_tao_out << version) &&
-- (_tao_out << value)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-- 0
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -49345,7 +48645,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+}
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
-+void IR_PublishesDef::_tao_any_destructor (void *x)
-+{
-+ IR_PublishesDef *tmp = ACE_static_cast (IR_PublishesDef*,x);
-+ CORBA::release (tmp);
++ IR_EmitsDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -49411,12 +48711,12 @@
+ return _tao_safe_retval._retn ();
}
-IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++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_PublishesDef_ptr IR_PublishesDef::_narrow (
-+ CORBA::Object_ptr obj,
++ IR_ValueDef_ptr value,
CORBA::Environment &ACE_TRY_ENV
)
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
+ ACE_THROW_SPEC ((
+@@ -49424,8 +48724,8 @@
+ ))
{
--
+
- IR::PublishesDef_ptr _tao_retval = IR::PublishesDef::_nil ();
- IR::PublishesDef_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_publishes",
-- 16,
-- 1,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-+ if (CORBA::is_nil (obj))
-+ return IR_PublishesDef::_nil ();
-+ if (! obj->_is_local ())
- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ IR_PublishesDef_ptr _tao_retval = IR_PublishesDef::_nil ();
++ IR_PublishesDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -49453,7 +48753,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- name,
-- version,
-- value,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-- (_tao_out << name) &&
-- (_tao_out << version) &&
-- (_tao_out << value)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-- 0
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -49526,7 +48826,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-+ 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 _tao_safe_retval._retn ();
-+ return IR_PublishesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ IR_PublishesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -49592,12 +48892,12 @@
+ return _tao_safe_retval._retn ();
}
-IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
-- CORBA_Object *_collocated_tao_target_,
-- const char * id,
-- const char * name,
-- const char * version,
++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,
-- CORBA::Environment &ACE_TRY_ENV
-+IR_PublishesDef_ptr IR_PublishesDef::_unchecked_narrow (
-+ CORBA::Object_ptr obj,
-+ CORBA::Environment &
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV
)
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- ))
+ ACE_THROW_SPEC ((
+@@ -49605,8 +48905,8 @@
+ ))
{
--
+
- IR::ConsumesDef_ptr _tao_retval = IR::ConsumesDef::_nil ();
- IR::ConsumesDef_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_consumes",
-- 15,
-- 1,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-+ if (CORBA::is_nil (obj))
-+ return IR_PublishesDef::_nil ();
-+ if (! obj->_is_local ())
- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
++ IR_ConsumesDef_ptr _tao_retval = IR_ConsumesDef::_nil ();
++ IR_ConsumesDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -49634,7 +48934,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- name,
-- version,
-- value,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-- (_tao_out << name) &&
-- (_tao_out << version) &&
-- (_tao_out << value)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-- 0
-- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -49707,7 +49007,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-+ 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 ()),
-
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-+ IR_PublishesDef::_nil ());
- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-+ 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
-+ )
-+ )
- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+}
-+
-+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)
-+{
-+ if (
-+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PublishesDef:1.0")) ||
-+ (!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_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;
-+}
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
-- return _tao_safe_retval._retn ();
-+const char* IR_PublishesDef::_interface_repository_id (void) const
-+{
-+ return "IDL:omg.org/IR/PublishesDef:1.0";
- }
-
-+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
-+
-+///////////////////////////////////////////////////////////////////////
-+// 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.
-@@ -49214,32 +25693,32 @@
++ IR_ConsumesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -49783,37 +49083,37 @@
// Remote & Base Proxy Broker Implementation
//
-IR::_TAO_ComponentDef_Proxy_Broker::_TAO_ComponentDef_Proxy_Broker (void)
-+_TAO_ConsumesDef_Proxy_Broker::_TAO_ConsumesDef_Proxy_Broker (void)
++_TAO_ComponentDef_Proxy_Broker::_TAO_ComponentDef_Proxy_Broker (void)
{
}
-IR::_TAO_ComponentDef_Proxy_Broker::~_TAO_ComponentDef_Proxy_Broker (void)
-+_TAO_ConsumesDef_Proxy_Broker::~_TAO_ConsumesDef_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_ConsumesDef_Remote_Proxy_Broker *the_TAO_ConsumesDef_Remote_Proxy_Broker (void)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_ComponentDef_Remote_Proxy_Broker *
+-IR::_TAO_ComponentDef_Remote_Proxy_Broker::the_TAO_ComponentDef_Remote_Proxy_Broker (void)
++_TAO_ComponentDef_Remote_Proxy_Broker *
++_TAO_ComponentDef_Remote_Proxy_Broker::the_TAO_ComponentDef_Remote_Proxy_Broker (void)
{
- static ::IR::_TAO_ComponentDef_Remote_Proxy_Broker remote_proxy_broker;
-+ static ::_TAO_ConsumesDef_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_ConsumesDef_Remote_Proxy_Broker::_TAO_ConsumesDef_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_ConsumesDef_Remote_Proxy_Broker::~_TAO_ConsumesDef_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_ConsumesDef_Proxy_Impl&
-+_TAO_ConsumesDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_ConsumesDef *object,
++_TAO_ComponentDef_Proxy_Impl&
++_TAO_ComponentDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_ComponentDef *object,
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -49255,116 +25734,115 @@
+@@ -49829,109 +49129,109 @@
// default constructor
-IR::ComponentDef::ComponentDef (int collocated)
-+IR_ConsumesDef::IR_ConsumesDef (int collocated)
++IR_ComponentDef::IR_ComponentDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_ComponentDef_setup_collocation (collocated);
}
// destructor
-IR::ComponentDef::~ComponentDef (void)
-+IR_ConsumesDef::~IR_ConsumesDef (void)
++IR_ComponentDef::~IR_ComponentDef (void)
{}
void
--IR::ComponentDef::_tao_setup_collocation (int collocated)
-+IR_ConsumesDef::_tao_setup_collocation (int collocated)
+-IR::ComponentDef::IR_ComponentDef_setup_collocation (int collocated)
++IR_ComponentDef::IR_ComponentDef_setup_collocation (int collocated)
{
if (collocated)
-- this->the_TAO_ComponentDef_Proxy_Broker_ =
+ this->the_TAO_ComponentDef_Proxy_Broker_ =
- ::IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer (this);
-+ this->the_TAO_ConsumesDef_Proxy_Broker_ =
-+ _TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_ComponentDef_Proxy_Broker_Factory_function_pointer (this);
else
-- this->the_TAO_ComponentDef_Proxy_Broker_ =
+ this->the_TAO_ComponentDef_Proxy_Broker_ =
- ::IR::_TAO_ComponentDef_Remote_Proxy_Broker::the_TAO_ComponentDef_Remote_Proxy_Broker ();
-+ this->the_TAO_ConsumesDef_Proxy_Broker_ =
-+ ::the_TAO_ConsumesDef_Remote_Proxy_Broker ();
-+
-+ IR_EventDef::_tao_setup_collocation (collocated);
++ _TAO_ComponentDef_Remote_Proxy_Broker::the_TAO_ComponentDef_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (IR, InterfaceDef)::_tao_setup_collocation (collocated);
+ this->IR_InterfaceDef_setup_collocation (collocated);
}
-void IR::ComponentDef::_tao_any_destructor (void *x)
-+void IR_ConsumesDef::_tao_any_destructor (void *x)
++void IR_ComponentDef::_tao_any_destructor (void *x)
{
- ComponentDef *tmp = ACE_static_cast (ComponentDef*,x);
-+ IR_ConsumesDef *tmp = ACE_static_cast (IR_ConsumesDef*,x);
++ IR_ComponentDef *tmp = ACE_static_cast (IR_ComponentDef*,x);
CORBA::release (tmp);
}
-IR::ComponentDef_ptr IR::ComponentDef::_narrow (
-+IR_ConsumesDef_ptr IR_ConsumesDef::_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_ConsumesDef::_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);
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (ComponentDef::_nil ());
-+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ConsumesDef:1.0", ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (IR_ConsumesDef::_nil ());
++ ACE_CHECK_RETURN (IR_ComponentDef::_nil ());
if (is_a == 0)
- return ComponentDef::_nil ();
-+ return IR_ConsumesDef::_nil ();
++ return IR_ComponentDef::_nil ();
}
- return ComponentDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+ return IR_ConsumesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_ComponentDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR::ComponentDef_ptr IR::ComponentDef::_unchecked_narrow (
-+IR_ConsumesDef_ptr IR_ConsumesDef::_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_ConsumesDef::_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_ConsumesDef_ptr default_proxy = IR_ConsumesDef::_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_ConsumesDef_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_ConsumesDef (
++ ::IR_ComponentDef (
stub,
1,
obj->_servant ()),
- ComponentDef::_nil ());
-+ IR_ConsumesDef::_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_ConsumesDef (stub, 0, obj->_servant ()), IR_ConsumesDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_ComponentDef (stub, 0, obj->_servant ()), IR_ComponentDef::_nil ());
return default_proxy;
}
else
@@ -63085,14 +26310,14 @@
ACE_reinterpret_cast
(
- ComponentDef_ptr,
-+ IR_ConsumesDef_ptr,
++ IR_ComponentDef_ptr,
obj->_tao_QueryInterface
(
ACE_reinterpret_cast
(
ptr_arith_t,
- &ComponentDef::_narrow
-+ &IR_ConsumesDef::_narrow
++ &IR_ComponentDef::_narrow
)
)
);
@@ -63100,8 +26325,8 @@
-IR::ComponentDef_ptr
-IR::ComponentDef::_duplicate (ComponentDef_ptr obj)
-+IR_ConsumesDef_ptr
-+IR_ConsumesDef::_duplicate (IR_ConsumesDef_ptr obj)
++IR_ComponentDef_ptr
++IR_ComponentDef::_duplicate (IR_ComponentDef_ptr obj)
{
if (!CORBA::is_nil (obj))
obj->_add_ref ();
@@ -63109,81 +26334,76 @@
}
-CORBA::Boolean IR::ComponentDef::_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)
++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/ConsumesDef:1.0")) ||
-+ (!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/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
-@@ -49372,70 +25850,46 @@
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentDef:1.0")) ||
+@@ -49946,70 +49246,70 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-void *IR::ComponentDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_ConsumesDef::_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_ConsumesDef::_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))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_InterfaceDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
- &ACE_NESTED_CLASS (::IR, Container)::_narrow))
-- retv = ACE_reinterpret_cast
-- (
-- void *,
-- ACE_static_cast
-- (
++ &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_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+ &IR_EventDef::_narrow))
++ &IR_Contained::_narrow))
retv = ACE_reinterpret_cast
(
void *,
ACE_static_cast
(
- IR::Contained_ptr,
-+ IR_EventDef_ptr,
++ IR_Contained_ptr,
this
)
);
else if (type == ACE_reinterpret_cast
(ptr_arith_t,
- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-+ &IR_Contained::_narrow))
++ &IR_IDLType::_narrow))
retv = ACE_reinterpret_cast
(
void *,
ACE_static_cast
(
- IR::IDLType_ptr,
-+ IR_Contained_ptr,
++ IR_IDLType_ptr,
this
)
);
@@ -63201,710 +26421,101 @@
this
)
);
-@@ -49448,12 +25902,37 @@
+@@ -50022,12 +49322,12 @@
return retv;
}
-const char* IR::ComponentDef::_interface_repository_id (void) const
-+const char* IR_ConsumesDef::_interface_repository_id (void) const
++const char* IR_ComponentDef::_interface_repository_id (void) const
{
-- return "IDL:omg.org/IR/ComponentDef:1.0";
-+ return "IDL:omg.org/IR/ConsumesDef:1.0";
+ return "IDL:omg.org/IR/ComponentDef:1.0";
}
-IR::InterfaceDefSeq * IR::ComponentDef::supported_interfaces (
-+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 = 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)
-+TAO_NAMESPACE_END
-+
-+///////////////////////////////////////////////////////////////////////
-+// Base & Remote Proxy Implementation.
-+//
-+
-+_TAO_ComponentDef_Proxy_Impl::_TAO_ComponentDef_Proxy_Impl (void)
-+{}
-+
-+_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remote_Proxy_Impl (void)
-+{}
-+
-+// Remote Implementation of the IDL interface methods
-+
-+IR_InterfaceDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
-+ CORBA_Object *_collocated_tao_target_,
++IR_InterfaceDefSeq * IR_ComponentDef::supported_interfaces (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -49461,29 +25940,133 @@
- ))
- {
-
-- return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).supported_interfaces (
-- this,
-- ACE_TRY_ENV
-+ IR_InterfaceDefSeq *_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_InterfaceDefSeq, _tao_retval);
-+ IR_InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_get_supported_interfaces",
-+ 25,
-+ 0,
-+ istub->orb_core ()
+@@ -50044,8 +49344,8 @@
);
-+
-+ 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;
-+ }
-+
-+ return _tao_safe_retval._retn ();
}
-void IR::ComponentDef::supported_interfaces (
- const IR::InterfaceDefSeq & supported_interfaces,
-+void _TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
-+ CORBA_Object *_collocated_tao_target_,
++void IR_ComponentDef::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 ());
-+
-
-- this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).supported_interfaces (
-- this,
-- supported_interfaces,
-- ACE_TRY_ENV
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_set_supported_interfaces",
-+ 25,
-+ 1,
-+ istub->orb_core ()
+@@ -50063,7 +49363,7 @@
);
-+
-+ for (;;)
-+ {
-+ _tao_call.start (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 << supported_interfaces)
-+ ))
-+ ACE_THROW (
-+ CORBA::MARSHAL ()
-+ );
-+
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK;
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
-+ {
-+ 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_,
++IR_ComponentDef_ptr IR_ComponentDef::base_component (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -49491,13 +26074,69 @@
- ))
- {
-
-- return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).base_component (
-- this,
-- ACE_TRY_ENV
-+ 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,
-+ "_get_base_component",
-+ 19,
-+ 0,
-+ istub->orb_core ()
+@@ -50080,7 +49380,7 @@
);
-+
-+ 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;
-+ }
-+
-+ 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_,
++IR_ProvidesDefSeq * IR_ComponentDef::provides_interfaces (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -49505,13 +26144,70 @@
- ))
- {
-
-- return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).provides_interfaces (
-- this,
-- ACE_TRY_ENV
-+ IR_ProvidesDefSeq *_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_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 ()
+@@ -50097,7 +49397,7 @@
);
-+
-+ 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;
-+ }
-+
-+ 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_,
++IR_UsesDefSeq * IR_ComponentDef::uses_interfaces (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -49519,13 +26215,70 @@
- ))
- {
-
-- return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).uses_interfaces (
-- this,
-- ACE_TRY_ENV
-+ IR_UsesDefSeq *_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_UsesDefSeq, _tao_retval);
-+ IR_UsesDefSeq_var _tao_safe_retval (_tao_retval);
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_get_uses_interfaces",
-+ 20,
-+ 0,
-+ istub->orb_core ()
+@@ -50114,7 +49414,7 @@
);
-+
-+ 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;
-+ }
-+
-+ 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_,
++IR_EmitsDefSeq * IR_ComponentDef::emits_events (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -49533,13 +26286,70 @@
- ))
- {
-
-- return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).emits_events (
-- this,
-- ACE_TRY_ENV
-+ IR_EmitsDefSeq *_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_EmitsDefSeq, _tao_retval);
-+ IR_EmitsDefSeq_var _tao_safe_retval (_tao_retval);
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_get_emits_events",
-+ 17,
-+ 0,
-+ istub->orb_core ()
+@@ -50131,7 +49431,7 @@
);
-+
-+ 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;
-+ }
-+
-+ 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_,
++IR_PublishesDefSeq * IR_ComponentDef::publishes_events (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -49547,13 +26357,70 @@
- ))
- {
-
-- return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).publishes_events (
-- this,
-- ACE_TRY_ENV
-+ IR_PublishesDefSeq *_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_PublishesDefSeq, _tao_retval);
-+ IR_PublishesDefSeq_var _tao_safe_retval (_tao_retval);
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_get_publishes_events",
-+ 21,
-+ 0,
-+ istub->orb_core ()
+@@ -50148,7 +49448,7 @@
);
-+
-+ 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;
-+ }
-+
-+ 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_,
++IR_ConsumesDefSeq * IR_ComponentDef::consumes_events (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -49561,13 +26428,70 @@
- ))
- {
-
-- return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).consumes_events (
-- this,
-- ACE_TRY_ENV
-+ IR_ConsumesDefSeq *_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_ConsumesDefSeq, _tao_retval);
-+ IR_ConsumesDefSeq_var _tao_safe_retval (_tao_retval);
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "_get_consumes_events",
-+ 20,
-+ 0,
-+ istub->orb_core ()
+@@ -50165,7 +49465,7 @@
);
-+
-+ 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;
-+ }
-+
-+ 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::Boolean IR_ComponentDef::is_basic (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -49575,17 +26499,72 @@
- ))
- {
-
-- return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_basic (
-- this,
-- ACE_TRY_ENV
-+ CORBA::Boolean _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_is_basic",
-+ 13,
-+ 0,
-+ istub->orb_core ()
+@@ -50182,11 +49482,11 @@
);
-+
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
-+ );
-+ ACE_CHECK_RETURN (_tao_retval);
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ 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),
-+ _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
-+ );
-+ }
-+ 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_,
++IR_ProvidesDef_ptr IR_ComponentDef::create_provides (
const char * id,
const char * name,
const char * version,
@@ -63913,94 +26524,12 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -49593,21 +26572,86 @@
- ))
- {
-
-- 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_ProvidesDef_ptr _tao_retval = IR_ProvidesDef::_nil ();
-+ IR_ProvidesDef_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_provides",
-+ 15,
-+ 1,
-+ istub->orb_core ()
+@@ -50207,11 +49507,11 @@
);
-+
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
-+ (_tao_out << name) &&
-+ (_tao_out << version) &&
-+ (_tao_out << interface_type)
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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;
-+ }
-+
-+ 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_,
++IR_UsesDef_ptr IR_ComponentDef::create_uses (
const char * id,
const char * name,
const char * version,
@@ -64009,116 +26538,26 @@
CORBA::Boolean is_multiple,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -49616,44 +26660,87 @@
- ))
- {
-
-- 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_UsesDef_ptr _tao_retval = IR_UsesDef::_nil ();
-+ IR_UsesDef_var _tao_safe_retval (_tao_retval);
-+
-+
-+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+@@ -50234,11 +49534,11 @@
+ );
+ }
-IR::EmitsDef_ptr IR::ComponentDef::create_emits (
-- const char * id,
-- const char * name,
-- const char * version,
++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
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "create_uses",
-+ 11,
-+ 1,
-+ istub->orb_core ()
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -50259,11 +49559,11 @@
);
-+
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
-+ (_tao_out << name) &&
-+ (_tao_out << version) &&
-+ (_tao_out << interface_type) &&
-+ (_tao_out << CORBA::Any::from_boolean (is_multiple))
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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;
-+ }
-+
-+ return _tao_safe_retval._retn ();
}
-IR::PublishesDef_ptr IR::ComponentDef::create_publishes (
-+IR_EmitsDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
-+ CORBA_Object *_collocated_tao_target_,
++IR_PublishesDef_ptr IR_ComponentDef::create_publishes (
const char * id,
const char * name,
const char * version,
@@ -64127,94 +26566,12 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -49661,21 +26748,86 @@
- ))
- {
-
-- return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_publishes (
-- this,
-- id,
-- name,
-- version,
-- value,
-- ACE_TRY_ENV
-+ IR_EmitsDef_ptr _tao_retval = IR_EmitsDef::_nil ();
-+ IR_EmitsDef_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_emits",
-+ 12,
-+ 1,
-+ istub->orb_core ()
+@@ -50284,11 +49584,11 @@
);
-+
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
-+ (_tao_out << name) &&
-+ (_tao_out << version) &&
-+ (_tao_out << value)
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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;
-+ }
-+
-+ return _tao_safe_retval._retn ();
}
-IR::ConsumesDef_ptr IR::ComponentDef::create_consumes (
-+IR_PublishesDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
-+ CORBA_Object *_collocated_tao_target_,
++IR_ConsumesDef_ptr IR_ComponentDef::create_consumes (
const char * id,
const char * name,
const char * version,
@@ -64223,1487 +26580,648 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -49683,976 +26835,669 @@
- ))
- {
-
-- return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_consumes (
-- this,
-- id,
-- name,
-- version,
-- value,
-- ACE_TRY_ENV
-- );
--}
--
+@@ -50309,9 +49609,8 @@
+ );
+ }
+
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -50320,7 +49619,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -50332,7 +49631,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -50345,7 +49644,7 @@
+
+
+ CORBA::Any *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -50361,16 +49660,16 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- const IR::InterfaceDefSeq & supported_interfaces,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- supported_interfaces_ (supported_interfaces)
--{}
--
--Dynamic::ParameterList *
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -50378,7 +49677,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_supported_interfaces = parameter_list->length ();
-- parameter_list->length (length_supported_interfaces + 1);
-- (*parameter_list)[length_supported_interfaces].argument <<= this->supported_interfaces_;
--
-- (*parameter_list)[length_supported_interfaces].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -50398,7 +49697,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -50411,7 +49710,7 @@
+
+
+ CORBA::Any *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 1;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ IR_PublishesDef_ptr _tao_retval = IR_PublishesDef::_nil ();
-+ IR_PublishesDef_var _tao_safe_retval (_tao_retval);
-
-- return result_any;
--}
--
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -50423,7 +49722,7 @@
+ return result_any;
+ }
+
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -50432,7 +49731,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return parameter_list;
--}
-+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -50444,7 +49743,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return exception_list;
--}
--
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "create_publishes",
-+ 16,
-+ 1,
-+ istub->orb_core ()
-+ );
-
--CORBA::Any *
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -50457,7 +49756,7 @@
+
+
+ CORBA::Any *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
-+ (_tao_out << name) &&
-+ (_tao_out << version) &&
-+ (_tao_out << value)
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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;
-+ }
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -50473,13 +49772,13 @@
+ }
--void
+ void
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (IR::ComponentDef_ptr result)
--{
-- // update the result
-- this->_result = result;
-+ return _tao_safe_retval._retn ();
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-+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,
-+ CORBA::Environment &ACE_TRY_ENV
- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -50488,7 +49787,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -50500,7 +49799,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -50513,7 +49812,7 @@
+
+
+ CORBA::Any *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
-
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -50529,13 +49828,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -50544,7 +49843,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-+ IR_ConsumesDef_ptr _tao_retval = IR_ConsumesDef::_nil ();
-+ IR_ConsumesDef_var _tao_safe_retval (_tao_retval);
-
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -50556,7 +49855,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return exception_list;
--}
--
-+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-+ if (istub == 0)
-+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -50569,7 +49868,7 @@
--CORBA::Any *
+
+ CORBA::Any *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -50585,13 +49884,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
-+ TAO_GIOP_Twoway_Invocation _tao_call (
-+ istub,
-+ "create_consumes",
-+ 15,
-+ 1,
-+ istub->orb_core ()
-+ );
-
--Dynamic::ParameterList *
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -50600,7 +49899,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
-+ (_tao_out << name) &&
-+ (_tao_out << version) &&
-+ (_tao_out << value)
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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;
-+ }
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -50612,7 +49911,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ return _tao_safe_retval._retn ();
- }
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -50625,7 +49924,7 @@
--CORBA::Any *
+ CORBA::Any *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -50641,13 +49940,13 @@
+ }
+
+ void
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (IR::EmitsDefSeq * result)
--{
-- // update the result
-- this->_result = result;
--}
-+//
-+// End Base & Remote Proxy Implemeentation.
-+///////////////////////////////////////////////////////////////////////
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
-
--Dynamic::ParameterList *
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -50656,7 +49955,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
-+///////////////////////////////////////////////////////////////////////
-+// Remote & Base Proxy Broker Implementation
-+//
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -50668,7 +49967,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+_TAO_ComponentDef_Proxy_Broker::_TAO_ComponentDef_Proxy_Broker (void)
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
- }
+ // Generate the exception list on demand.
+@@ -50681,7 +49980,7 @@
--
--CORBA::Any *
+
+ CORBA::Any *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+_TAO_ComponentDef_Proxy_Broker::~_TAO_ComponentDef_Proxy_Broker (void)
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
+ // Generate the result on demand.
+@@ -50697,13 +49996,13 @@
}
--void
+ void
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (IR::PublishesDefSeq * result)
-+// Factory function Implementation.
-+_TAO_ComponentDef_Remote_Proxy_Broker *the_TAO_ComponentDef_Remote_Proxy_Broker (void)
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (IR_PublishesDefSeq * result)
{
-- // update the result
-- this->_result = result;
-+ static ::_TAO_ComponentDef_Remote_Proxy_Broker remote_proxy_broker;
-+ return &remote_proxy_broker;
+ // update the result
+ this->_result = result;
}
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -50712,7 +50011,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+_TAO_ComponentDef_Remote_Proxy_Broker::_TAO_ComponentDef_Remote_Proxy_Broker (void)
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
+ // Generate the argument list on demand.
+@@ -50724,7 +50023,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+_TAO_ComponentDef_Remote_Proxy_Broker::~_TAO_ComponentDef_Remote_Proxy_Broker (void)
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
- }
+ // Generate the exception list on demand.
+@@ -50737,7 +50036,7 @@
--
--CORBA::Any *
+
+ CORBA::Any *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+_TAO_ComponentDef_Proxy_Impl&
-+_TAO_ComponentDef_Remote_Proxy_Broker::select_proxy (
-+ ::IR_ComponentDef *object,
-+ CORBA::Environment &ACE_TRY_ENV
-+)
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
-+ ACE_UNUSED_ARG (object);
-+ ACE_UNUSED_ARG (ACE_TRY_ENV);
-+ return remote_proxy_impl_;
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -50753,13 +50052,13 @@
}
--void
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
-+//
-+// End Remote & Base Proxy Broker Implementation
-+///////////////////////////////////////////////////////////////////////
-
--Dynamic::ParameterList *
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -50768,7 +50067,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -50780,7 +50079,7 @@
+ }
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+// default constructor
-+IR_ComponentDef::IR_ComponentDef (int collocated)
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ this->_tao_setup_collocation (collocated);
- }
+ // Generate the exception list on demand.
+@@ -50793,7 +50092,7 @@
-+// destructor
-+IR_ComponentDef::~IR_ComponentDef (void)
-+{}
--CORBA::Any *
+ CORBA::Any *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void
-+IR_ComponentDef::_tao_setup_collocation (int collocated)
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_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 ();
-
-- CORBA::Any_var safe_result_any = result_any;
-+ IR_InterfaceDef::_tao_setup_collocation (collocated);
-
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-- return safe_result_any._retn ();
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -50809,19 +50108,19 @@
}
--void
+ void
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Boolean result)
-+void IR_ComponentDef::_tao_any_destructor (void *x)
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Boolean result)
{
-- // update the result
-- this->_result = result;
-+ IR_ComponentDef *tmp = ACE_static_cast (IR_ComponentDef*,x);
-+ CORBA::release (tmp);
+ // update the result
+ this->_result = result;
}
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::TAO_ClientRequestInfo_IR_ComponentDef_create_provides (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::TAO_ClientRequestInfo_IR_ComponentDef_create_provides (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * id,
+ const char * name,
+ const char * version,
- IR::InterfaceDef_ptr interface_type,
-- CORBA::Environment &
-+IR_ComponentDef_ptr IR_ComponentDef::_narrow (
-+ CORBA::Object_ptr obj,
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_InterfaceDef_ptr interface_type,
+ CORBA::Environment &
)
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- interface_type_ (interface_type)
--{}
--
--Dynamic::ParameterList *
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -50832,7 +50131,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_interface_type = parameter_list->length ();
-- parameter_list->length (length_interface_type + 1);
-- (*parameter_list)[length_interface_type].argument <<= this->interface_type_;
--
-- (*parameter_list)[length_interface_type].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ if (CORBA::is_nil (obj))
-+ 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 (IR_ComponentDef::_nil ());
-+ if (is_a == 0)
-+ return IR_ComponentDef::_nil ();
-+ }
-+ return IR_ComponentDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ // Generate the argument list on demand.
+@@ -50867,7 +50166,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR_ComponentDef_ptr IR_ComponentDef::_unchecked_narrow (
-+ CORBA::Object_ptr obj,
-+ CORBA::Environment &
-+ )
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
-+ 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 ();
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -50880,7 +50179,7 @@
-+ 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
-+ )
-+ )
-+ );
-+}
--CORBA::Any *
+ CORBA::Any *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR_ComponentDef_ptr
-+IR_ComponentDef::_duplicate (IR_ComponentDef_ptr obj)
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
-+ if (!CORBA::is_nil (obj))
-+ obj->_add_ref ();
-+ return obj;
+ // Generate the result on demand.
+@@ -50896,19 +50195,19 @@
}
--void
+ void
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (IR::ProvidesDef_ptr result)
-+CORBA::Boolean IR_ComponentDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (IR_ProvidesDef_ptr result)
{
-- // update the result
-- this->_result = result;
-+ 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);
+ // update the result
+ this->_result = result;
}
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::TAO_ClientRequestInfo_IR_ComponentDef_create_uses (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::TAO_ClientRequestInfo_IR_ComponentDef_create_uses (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- interface_type_ (interface_type),
-- is_multiple_ (is_multiple)
--{}
--
--Dynamic::ParameterList *
++ IR_InterfaceDef_ptr interface_type,
+ const CORBA::Boolean & is_multiple,
+ CORBA::Environment &
+ )
+@@ -50921,7 +50220,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+void *IR_ComponentDef::_tao_QueryInterface (ptr_arith_t type)
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_interface_type = parameter_list->length ();
-- parameter_list->length (length_interface_type + 1);
-- (*parameter_list)[length_interface_type].argument <<= this->interface_type_;
--
-- (*parameter_list)[length_interface_type].mode = Dynamic::PARAM_IN;
-+ 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));
-
-- CORBA::ULong length_is_multiple = parameter_list->length ();
-- parameter_list->length (length_is_multiple + 1);
-- (*parameter_list)[length_is_multiple].argument <<= CORBA::Any::from_boolean (this->is_multiple_);
-- (*parameter_list)[length_is_multiple].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ if (retv)
-+ this->_add_ref ();
-+ return retv;
+ // Generate the argument list on demand.
+@@ -50961,7 +50260,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+const char* IR_ComponentDef::_interface_repository_id (void) const
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
-+ return "IDL:omg.org/IR/ComponentDef:1.0";
- }
+ // Generate the exception list on demand.
+@@ -50974,7 +50273,7 @@
--
--CORBA::Any *
+
+ CORBA::Any *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR_InterfaceDefSeq * IR_ComponentDef::supported_interfaces (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
-
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
-+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).supported_interfaces (
-+ this,
-+ ACE_TRY_ENV
-+ );
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -50990,19 +50289,19 @@
}
--void
+ void
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (IR::UsesDef_ptr result)
-+void IR_ComponentDef::supported_interfaces (
-+ const IR_InterfaceDefSeq & supported_interfaces,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // update the result
-- this->_result = result;
-+
-+ this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).supported_interfaces (
-+ this,
-+ supported_interfaces,
-+ ACE_TRY_ENV
-+ );
++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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::TAO_ClientRequestInfo_IR_ComponentDef_create_emits (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * id,
+ const char * name,
+ const char * version,
- IR::ValueDef_ptr value,
-- CORBA::Environment &
-+IR_ComponentDef_ptr IR_ComponentDef::base_component (
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_ValueDef_ptr value,
+ CORBA::Environment &
)
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- value_ (value)
--{}
--
--Dynamic::ParameterList *
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -51013,7 +50312,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_value = parameter_list->length ();
-- parameter_list->length (length_value + 1);
-- (*parameter_list)[length_value].argument <<= this->value_;
--
-- (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
-
-- return safe_parameter_list._retn ();
-+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).base_component (
-+ this,
-+ ACE_TRY_ENV
-+ );
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -51048,7 +50347,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR_ProvidesDefSeq * IR_ComponentDef::provides_interfaces (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return exception_list;
-+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).provides_interfaces (
-+ this,
-+ ACE_TRY_ENV
-+ );
- }
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -51061,7 +50360,7 @@
--
--CORBA::Any *
+
+ CORBA::Any *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR_UsesDefSeq * IR_ComponentDef::uses_interfaces (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
-
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
-+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).uses_interfaces (
-+ this,
-+ ACE_TRY_ENV
-+ );
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -51077,19 +50376,19 @@
}
--void
+ void
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (IR::EmitsDef_ptr result)
-+IR_EmitsDefSeq * IR_ComponentDef::emits_events (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (IR_EmitsDef_ptr result)
{
-- // update the result
-- this->_result = result;
-+
-+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).emits_events (
-+ this,
-+ ACE_TRY_ENV
-+ );
+ // update the result
+ this->_result = result;
}
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * id,
+ const char * name,
+ const char * version,
- IR::ValueDef_ptr value,
-- CORBA::Environment &
-+IR_PublishesDefSeq * IR_ComponentDef::publishes_events (
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_ValueDef_ptr value,
+ CORBA::Environment &
)
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- value_ (value)
--{}
--
--Dynamic::ParameterList *
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -51100,7 +50399,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_value = parameter_list->length ();
-- parameter_list->length (length_value + 1);
-- (*parameter_list)[length_value].argument <<= this->value_;
--
-- (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
-+{
-
-- return safe_parameter_list._retn ();
-+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).publishes_events (
-+ this,
-+ ACE_TRY_ENV
-+ );
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -51135,7 +50434,7 @@
}
--Dynamic::ExceptionList *
+ Dynamic::ExceptionList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+IR_ConsumesDefSeq * IR_ComponentDef::consumes_events (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return exception_list;
-+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).consumes_events (
-+ this,
-+ ACE_TRY_ENV
-+ );
- }
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -51148,7 +50447,7 @@
--
--CORBA::Any *
+
+ CORBA::Any *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+CORBA::Boolean IR_ComponentDef::is_basic (
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
-+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_basic (
-+ this,
-+ ACE_TRY_ENV
-+ );
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -51164,19 +50463,19 @@
}
--void
+ void
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (IR::PublishesDef_ptr result)
-+IR_ProvidesDef_ptr IR_ComponentDef::create_provides (
-+ const char * id,
-+ const char * name,
-+ const char * version,
-+ IR_InterfaceDef_ptr interface_type,
-+ 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_provides (
-+ this,
-+ id,
-+ name,
-+ version,
-+ interface_type,
-+ ACE_TRY_ENV
-+ );
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (IR_PublishesDef_ptr result)
+ {
+ // update the result
+ this->_result = result;
}
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-+IR_UsesDef_ptr IR_ComponentDef::create_uses (
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
const char * id,
const char * name,
const char * version,
- IR::ValueDef_ptr value,
-- CORBA::Environment &
-+ IR_InterfaceDef_ptr interface_type,
-+ CORBA::Boolean is_multiple,
-+ CORBA::Environment &ACE_TRY_ENV
++ IR_ValueDef_ptr value,
+ CORBA::Environment &
)
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- value_ (value)
--{}
--
--Dynamic::ParameterList *
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -51187,7 +50486,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ ))
- {
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_value = parameter_list->length ();
-- parameter_list->length (length_value + 1);
-- (*parameter_list)[length_value].argument <<= this->value_;
-
-- (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
-+ 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
-+ );
- }
-
--Dynamic::ExceptionList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+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
-+ ))
- {
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
-
-- return exception_list;
-+ 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::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -51222,7 +50521,7 @@
}
--
--CORBA::Any *
+ Dynamic::ExceptionList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::exceptions (CORBA::Environment &ACE_TRY_ENV)
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -51235,7 +50534,7 @@
+
+
+ CORBA::Any *
-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
-+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
-+ ))
- {
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
-
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
-+ 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 (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -51251,24 +50550,26 @@
+ }
+
+ 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
-+ );
++IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (IR_ConsumesDef_ptr result)
+ {
+ // update the result
+ this->_result = result;
}
--#endif /* TAO_HAS_INTERCEPTORS */
+ #endif /* TAO_HAS_INTERCEPTORS */
++
static const CORBA::Long _oc_IR_ComponentDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -65721,7 +27239,7 @@
static const CORBA::Long _oc_IR_ComponentDescription[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -50729,7 +27574,7 @@
+@@ -51345,7 +50646,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
@@ -65730,7 +27248,7 @@
CORBA::tk_sequence, // typecode kind
72, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -50737,7 +27582,7 @@
+@@ -51353,7 +50654,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
@@ -65739,7 +27257,7 @@
0U,
-@@ -50747,7 +27592,7 @@
+@@ -51363,7 +50664,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
@@ -65748,7 +27266,7 @@
CORBA::tk_sequence, // typecode kind
64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -50755,7 +27600,7 @@
+@@ -51371,7 +50672,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
@@ -65757,7 +27275,7 @@
0U,
-@@ -50949,7 +27794,7 @@
+@@ -51565,7 +50866,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
@@ -65766,7 +27284,7 @@
CORBA::tk_sequence, // typecode kind
68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -50957,7 +27802,7 @@
+@@ -51573,7 +50874,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
@@ -65775,7 +27293,7 @@
0U,
-@@ -50967,7 +27812,7 @@
+@@ -51583,7 +50884,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
@@ -65784,7 +27302,7 @@
CORBA::tk_sequence, // typecode kind
76, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -50975,7 +27820,7 @@
+@@ -51591,7 +50892,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
@@ -65793,7 +27311,7 @@
0U,
-@@ -50985,7 +27830,7 @@
+@@ -51601,7 +50902,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
@@ -65802,7 +27320,7 @@
CORBA::tk_sequence, // typecode kind
72, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -50993,7 +27838,7 @@
+@@ -51609,7 +50910,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
@@ -65811,7 +27329,7 @@
0U,
-@@ -51002,14 +27847,15 @@
+@@ -51618,14 +50919,15 @@
CORBA::tk_boolean,
};
@@ -65830,7 +27348,7 @@
delete tmp;
}
-@@ -51018,15 +27864,15 @@
+@@ -51634,15 +50936,15 @@
// Base & Remote Proxy Implementation.
//
@@ -65849,195 +27367,16 @@
CORBA_Object *_collocated_tao_target_,
const char * primary_key_id,
CORBA::Environment &ACE_TRY_ENV
-@@ -51052,151 +27898,61 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
-+ );
-+ 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
-+ );
+@@ -51680,7 +50982,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
--#if TAO_HAS_INTERCEPTORS == 1
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- primary_key_id,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << primary_key_id)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ 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),
- _tao_retval
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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))
-- ))
-- {
-- TAO_INTERCEPTOR_THROW_RETURN (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
-- CORBA::Boolean _tao_retval_info = _tao_retval;
-- ri.result (_tao_retval_info);
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ primary_key_id,
+@@ -51812,7 +51114,7 @@
return _tao_retval;
}
@@ -66046,7 +27385,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -51205,8 +27961,8 @@
+@@ -51821,8 +51123,8 @@
))
{
@@ -66057,181 +27396,25 @@
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -51222,137 +27978,47 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -51850,7 +51152,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -51906,7 +51208,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ 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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ 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)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
- return _tao_safe_retval._retn ();
- }
-
-@@ -51366,32 +28032,32 @@
++ IR_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -51982,37 +51284,37 @@
// Remote & Base Proxy Broker Implementation
//
@@ -66245,10 +27428,16 @@
{
}
--// 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)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker *
+-IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::the_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void)
++_TAO_PrimaryKeyDef_Remote_Proxy_Broker *
++_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;
@@ -66274,14 +27463,14 @@
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -51407,109 +28073,110 @@
+@@ -52028,109 +51330,109 @@
// default constructor
-IR::PrimaryKeyDef::PrimaryKeyDef (int collocated)
+IR_PrimaryKeyDef::IR_PrimaryKeyDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_PrimaryKeyDef_setup_collocation (collocated);
}
// destructor
@@ -66290,8 +27479,8 @@
{}
void
--IR::PrimaryKeyDef::_tao_setup_collocation (int collocated)
-+IR_PrimaryKeyDef::_tao_setup_collocation (int collocated)
+-IR::PrimaryKeyDef::IR_PrimaryKeyDef_setup_collocation (int collocated)
++IR_PrimaryKeyDef::IR_PrimaryKeyDef_setup_collocation (int collocated)
{
if (collocated)
this->the_TAO_PrimaryKeyDef_Proxy_Broker_ =
@@ -66300,11 +27489,9 @@
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 ();
-+
-+ IR_Contained::_tao_setup_collocation (collocated);
++ _TAO_PrimaryKeyDef_Remote_Proxy_Broker::the_TAO_PrimaryKeyDef_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (IR, Contained)::_tao_setup_collocation (collocated);
+ this->IR_Contained_setup_collocation (collocated);
}
-void IR::PrimaryKeyDef::_tao_any_destructor (void *x)
@@ -66410,7 +27597,7 @@
{
if (
(!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PrimaryKeyDef:1.0")) ||
-@@ -51521,34 +28188,34 @@
+@@ -52142,34 +51444,34 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
@@ -66451,7 +27638,7 @@
this
)
);
-@@ -51561,12 +28228,12 @@
+@@ -52182,12 +51484,12 @@
return retv;
}
@@ -66466,7 +27653,7 @@
const char * primary_key_id,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -51582,7 +28249,7 @@
+@@ -52206,7 +51508,7 @@
);
}
@@ -66475,134 +27662,100 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -51596,141 +28263,18 @@
+@@ -52223,9 +51525,8 @@
);
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * primary_key_id,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- primary_key_id_ (primary_key_id)
--{}
--
--Dynamic::ParameterList *
++IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * primary_key_id,
+@@ -52236,7 +51537,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_primary_key_id = parameter_list->length ();
-- parameter_list->length (length_primary_key_id + 1);
-- (*parameter_list)[length_primary_key_id].argument <<= primary_key_id_;
-- (*parameter_list)[length_primary_key_id].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -52255,7 +51556,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -52268,7 +51569,7 @@
+
+
+ CORBA::Any *
-IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-- return safe_result_any._retn ();
--}
--
--void
++IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -52284,13 +51585,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -52299,7 +51600,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -52311,7 +51612,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -52324,7 +51625,7 @@
+
+
+ CORBA::Any *
-IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -52340,24 +51641,26 @@
+ }
+
+ 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 */
++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
@@ -66620,7 +27773,7 @@
static const CORBA::Long _oc_IR_PrimaryKeyDescription[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -51778,17 +28322,18 @@
+@@ -52405,17 +51708,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
@@ -66643,7 +27796,7 @@
delete tmp;
}
-@@ -51797,10 +28342,10 @@
+@@ -52424,10 +51728,10 @@
// Base & Remote Proxy Implementation.
//
@@ -66656,7 +27809,7 @@
{}
// Remote Implementation of the IDL interface methods
-@@ -51815,32 +28360,32 @@
+@@ -52442,37 +51746,37 @@
// Remote & Base Proxy Broker Implementation
//
@@ -66670,10 +27823,16 @@
{
}
--// 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)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_FactoryDef_Remote_Proxy_Broker *
+-IR::_TAO_FactoryDef_Remote_Proxy_Broker::the_TAO_FactoryDef_Remote_Proxy_Broker (void)
++_TAO_FactoryDef_Remote_Proxy_Broker *
++_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;
@@ -66699,14 +27858,14 @@
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -51856,109 +28401,110 @@
+@@ -52488,109 +51792,109 @@
// default constructor
-IR::FactoryDef::FactoryDef (int collocated)
+IR_FactoryDef::IR_FactoryDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_FactoryDef_setup_collocation (collocated);
}
// destructor
@@ -66715,8 +27874,8 @@
{}
void
--IR::FactoryDef::_tao_setup_collocation (int collocated)
-+IR_FactoryDef::_tao_setup_collocation (int collocated)
+-IR::FactoryDef::IR_FactoryDef_setup_collocation (int collocated)
++IR_FactoryDef::IR_FactoryDef_setup_collocation (int collocated)
{
if (collocated)
this->the_TAO_FactoryDef_Proxy_Broker_ =
@@ -66725,11 +27884,9 @@
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 ();
-+
-+ IR_OperationDef::_tao_setup_collocation (collocated);
++ _TAO_FactoryDef_Remote_Proxy_Broker::the_TAO_FactoryDef_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (IR, OperationDef)::_tao_setup_collocation (collocated);
+ this->IR_OperationDef_setup_collocation (collocated);
}
-void IR::FactoryDef::_tao_any_destructor (void *x)
@@ -66835,7 +27992,7 @@
{
if (
(!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FactoryDef:1.0")) ||
-@@ -51971,46 +28517,46 @@
+@@ -52603,46 +51907,46 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
@@ -66890,7 +28047,7 @@
this
)
);
-@@ -52023,21 +28569,18 @@
+@@ -52655,21 +51959,18 @@
return retv;
}
@@ -66915,7 +28072,7 @@
TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FactoryDef, &_tc_TAO_tc_IR_FactoryDef)
-@@ -52047,10 +28590,10 @@
+@@ -52679,10 +51980,10 @@
// Base & Remote Proxy Implementation.
//
@@ -66928,7 +28085,7 @@
{}
// Remote Implementation of the IDL interface methods
-@@ -52065,32 +28608,32 @@
+@@ -52697,37 +51998,37 @@
// Remote & Base Proxy Broker Implementation
//
@@ -66942,10 +28099,16 @@
{
}
--// 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)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_FinderDef_Remote_Proxy_Broker *
+-IR::_TAO_FinderDef_Remote_Proxy_Broker::the_TAO_FinderDef_Remote_Proxy_Broker (void)
++_TAO_FinderDef_Remote_Proxy_Broker *
++_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;
@@ -66971,14 +28134,14 @@
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -52106,109 +28649,110 @@
+@@ -52743,109 +52044,109 @@
// default constructor
-IR::FinderDef::FinderDef (int collocated)
+IR_FinderDef::IR_FinderDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_FinderDef_setup_collocation (collocated);
}
// destructor
@@ -66987,8 +28150,8 @@
{}
void
--IR::FinderDef::_tao_setup_collocation (int collocated)
-+IR_FinderDef::_tao_setup_collocation (int collocated)
+-IR::FinderDef::IR_FinderDef_setup_collocation (int collocated)
++IR_FinderDef::IR_FinderDef_setup_collocation (int collocated)
{
if (collocated)
this->the_TAO_FinderDef_Proxy_Broker_ =
@@ -66997,11 +28160,9 @@
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 ();
-+
-+ IR_OperationDef::_tao_setup_collocation (collocated);
++ _TAO_FinderDef_Remote_Proxy_Broker::the_TAO_FinderDef_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (IR, OperationDef)::_tao_setup_collocation (collocated);
+ this->IR_OperationDef_setup_collocation (collocated);
}
-void IR::FinderDef::_tao_any_destructor (void *x)
@@ -67107,7 +28268,7 @@
{
if (
(!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FinderDef:1.0")) ||
-@@ -52221,46 +28765,46 @@
+@@ -52858,46 +52159,46 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
@@ -67162,7 +28323,7 @@
this
)
);
-@@ -52273,21 +28817,18 @@
+@@ -52910,21 +52211,18 @@
return retv;
}
@@ -67187,7 +28348,7 @@
TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FinderDef, &_tc_TAO_tc_IR_FinderDef)
-@@ -52297,15 +28838,15 @@
+@@ -52934,15 +52232,15 @@
// Base & Remote Proxy Implementation.
//
@@ -67206,7 +28367,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -52314,8 +28855,8 @@
+@@ -52951,8 +52249,8 @@
))
{
@@ -67217,189 +28378,25 @@
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -52325,147 +28866,57 @@
-
- TAO_GIOP_Twoway_Invocation _tao_call (
- istub,
-- "_get_base_home",
-- 14,
-- 0,
-- istub->orb_core ()
-- );
--
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -52980,7 +52278,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -53036,7 +52334,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ "_get_base_home",
-+ 14,
-+ 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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ 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)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_HomeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -53102,7 +52400,7 @@
return _tao_safe_retval._retn ();
}
@@ -67408,7 +28405,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -52474,8 +28925,8 @@
+@@ -53111,8 +52409,8 @@
))
{
@@ -67419,177 +28416,25 @@
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -52491,141 +28942,51 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -53140,7 +52438,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -53196,7 +52494,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ 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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ 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)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -53262,7 +52560,7 @@
return _tao_safe_retval._retn ();
}
@@ -67598,7 +28443,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -52634,8 +28995,8 @@
+@@ -53271,8 +52569,8 @@
))
{
@@ -67609,177 +28454,25 @@
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -52651,141 +29012,51 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -53300,7 +52598,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -53356,7 +52654,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ 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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ 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)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_PrimaryKeyDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -53422,7 +52720,7 @@
return _tao_safe_retval._retn ();
}
@@ -67788,7 +28481,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -52794,7 +29065,7 @@
+@@ -53431,7 +52729,7 @@
))
{
@@ -67797,7 +28490,7 @@
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -52802,8 +29073,8 @@
+@@ -53439,8 +52737,8 @@
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
@@ -67808,177 +28501,25 @@
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_factories",
-@@ -52812,141 +29083,51 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -53461,7 +52759,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -53517,7 +52815,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::FactoryDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ 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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ 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)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_FactoryDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -53583,7 +52881,7 @@
return _tao_safe_retval._retn ();
}
@@ -67987,7 +28528,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -52955,7 +29136,7 @@
+@@ -53592,7 +52890,7 @@
))
{
@@ -67996,7 +28537,7 @@
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -52963,8 +29144,8 @@
+@@ -53600,8 +52898,8 @@
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
@@ -68007,177 +28548,25 @@
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_finders",
-@@ -52973,141 +29154,51 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -53622,7 +52920,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
++ IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -53678,7 +52976,7 @@
+ }
+
+ TAO_INTERCEPTOR (
- IR::FinderDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-- ri.result (_tao_retval_info);
-- _tao_safe_retval = _tao_retval_info;
-- );
--
-- TAO_INTERCEPTOR (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ 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_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ 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)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ 0
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_FinderDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -53744,7 +53042,7 @@
return _tao_safe_retval._retn ();
}
@@ -68186,176 +28575,16 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -53132,145 +29223,56 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -53781,7 +53079,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (_tao_retval);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- TAO_INTERCEPTOR_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))
-- ))
-- {
-- TAO_INTERCEPTOR_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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-+ for (;;)
-+ {
-+ _tao_call.start (ACE_TRY_ENV);
-+ ACE_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
- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-+ ACE_CHECK_RETURN (_tao_retval);
-+ int _invoke_status =
-+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
-+ ACE_CHECK_RETURN (_tao_retval);
-+
-+ if (_invoke_status == TAO_INVOKE_RESTART)
-+ {
-+ _tao_call.restart_flag (1);
-+ continue;
-+ }
-+ if (_invoke_status != TAO_INVOKE_OK)
- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-+ ACE_THROW_RETURN (
-+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-+ _tao_retval
-+ );
- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (_tao_retval);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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
-+ );
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ ACE_TRY_ENV
+@@ -53902,12 +53200,12 @@
return _tao_retval;
}
@@ -68370,7 +28599,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -53278,8 +29280,8 @@
+@@ -53915,8 +53213,8 @@
))
{
@@ -68381,203 +28610,25 @@
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -53295,164 +29297,70 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -53944,7 +53242,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- name,
-- version,
-- primary_key,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
- (_tao_out << name) &&
- (_tao_out << version) &&
- (_tao_out << primary_key)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -54017,7 +53315,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_PrimaryKeyDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -54083,13 +53381,13 @@
return _tao_safe_retval._retn ();
}
@@ -68594,7 +28645,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -53460,8 +29368,8 @@
+@@ -54097,8 +53395,8 @@
))
{
@@ -68605,205 +28656,25 @@
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -53477,166 +29385,71 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -54126,7 +53424,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- name,
-- version,
-- params,
-- exceptions,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
- (_tao_out << name) &&
- (_tao_out << version) &&
- (_tao_out << params) &&
- (_tao_out << exceptions)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -54201,7 +53499,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
++ IR_FactoryDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -54267,13 +53565,13 @@
return _tao_safe_retval._retn ();
}
@@ -68820,7 +28691,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -53644,8 +29457,8 @@
+@@ -54281,8 +53579,8 @@
))
{
@@ -68831,209 +28702,25 @@
TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -53661,156 +29474,61 @@
- istub->orb_core ()
- );
-
--#if (TAO_HAS_INTERCEPTORS == 1)
-- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-- istub->orb_core ()->client_request_interceptors ()
-- );
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- for (;;)
-- {
-- int _invoke_status = TAO_INVOKE_EXCEPTION;
--
--#if TAO_HAS_INTERCEPTORS == 1
+@@ -54310,7 +53608,7 @@
+ int _invoke_status = TAO_INVOKE_EXCEPTION;
+
+ #if TAO_HAS_INTERCEPTORS == 1
- IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder ri (
-- &_tao_call,
-- _collocated_tao_target_,
-- id,
-- name,
-- version,
-- params,
-- exceptions,
-- ACE_TRY_ENV
-- );
-- ACE_CHECK_RETURN (0);
--
-- ACE_TRY
-- {
--#endif /* TAO_HAS_INTERCEPTORS */
--
-- _tao_call.start (ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-- TAO_INTERCEPTOR (ri.response_expected (1));
--
-- TAO_INTERCEPTOR (
-- _tao_vfr.send_request (
-- &ri,
-- ACE_TRY_ENV
-- )
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- _tao_call.prepare_header (
-- ACE_static_cast (CORBA::Octet, _tao_response_flag),
-- ACE_TRY_ENV
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-- if (!(
-- (_tao_out << id) &&
-+ 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);
-+
-+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-+ if (!(
-+ (_tao_out << id) &&
- (_tao_out << name) &&
- (_tao_out << version) &&
- (_tao_out << params) &&
- (_tao_out << exceptions)
-- ))
-- TAO_INTERCEPTOR_THROW_RETURN (
-- CORBA::MARSHAL (),
-+ ))
-+ ACE_THROW_RETURN (
-+ CORBA::MARSHAL (),
-+ 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
- );
--
-- _invoke_status =
-- _tao_call.invoke (0, 0, ACE_TRY_ENV);
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
-- if (_invoke_status == TAO_INVOKE_EXCEPTION)
-- {
-- 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 (
-+ }
-+ 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
- );
--
-- }
--
-- TAO_INTERCEPTOR (
++ IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder ri (
+ &_tao_call,
+ _collocated_tao_target_,
+ id,
+@@ -54385,7 +53683,7 @@
+ }
+
+ 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 (
-- ri.reply_status (_invoke_status);
-- if (_invoke_status == TAO_INVOKE_OK)
-- {
-- _tao_vfr.receive_reply (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
-- else
-- {
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- }
--
-- );
-- TAO_INTERCEPTOR_CHECK_RETURN (0);
--
--#if TAO_HAS_INTERCEPTORS == 1
-- }
-- ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-- {
-- _invoke_status =
-- _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-- ACE_TRY_CHECK;
--
-- ri.forward_reference (exc);
-- _tao_vfr.receive_other (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- }
-- ACE_CATCHANY
-- {
-- ri.exception (&ACE_ANY_EXCEPTION);
-- _tao_vfr.receive_exception (
-- &ri,
-- ACE_TRY_ENV
-- );
-- ACE_TRY_CHECK;
-- ACE_RE_THROW;
-- }
-- ACE_ENDTRY;
-- ACE_CHECK_RETURN (0);
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ }
-+ break;
-+ }
-
-- if (_invoke_status == TAO_INVOKE_RESTART)
-- {
-- _tao_call.restart_flag (1);
-- continue;
-- }
--
-- break;
-- }
- return _tao_safe_retval._retn ();
- }
-
-@@ -53824,32 +29542,32 @@
++ IR_FinderDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+ ri.result (_tao_retval_info);
+ _tao_safe_retval = _tao_retval_info;
+ );
+@@ -54461,37 +53759,37 @@
// Remote & Base Proxy Broker Implementation
//
@@ -69047,10 +28734,16 @@
{
}
--// 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)
+-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;
+
+ // Factory Member function Implementation.
+-IR::_TAO_HomeDef_Remote_Proxy_Broker *
+-IR::_TAO_HomeDef_Remote_Proxy_Broker::the_TAO_HomeDef_Remote_Proxy_Broker (void)
++_TAO_HomeDef_Remote_Proxy_Broker *
++_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;
@@ -69076,14 +28769,14 @@
CORBA::Environment &ACE_TRY_ENV
)
{
-@@ -53865,109 +29583,110 @@
+@@ -54507,109 +53805,109 @@
// default constructor
-IR::HomeDef::HomeDef (int collocated)
+IR_HomeDef::IR_HomeDef (int collocated)
{
- this->_tao_setup_collocation (collocated);
+ this->IR_HomeDef_setup_collocation (collocated);
}
// destructor
@@ -69092,8 +28785,8 @@
{}
void
--IR::HomeDef::_tao_setup_collocation (int collocated)
-+IR_HomeDef::_tao_setup_collocation (int collocated)
+-IR::HomeDef::IR_HomeDef_setup_collocation (int collocated)
++IR_HomeDef::IR_HomeDef_setup_collocation (int collocated)
{
if (collocated)
this->the_TAO_HomeDef_Proxy_Broker_ =
@@ -69102,11 +28795,9 @@
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 ();
-+
-+ IR_InterfaceDef::_tao_setup_collocation (collocated);
++ _TAO_HomeDef_Remote_Proxy_Broker::the_TAO_HomeDef_Remote_Proxy_Broker ();
-- ACE_NESTED_CLASS (IR, InterfaceDef)::_tao_setup_collocation (collocated);
+ this->IR_InterfaceDef_setup_collocation (collocated);
}
-void IR::HomeDef::_tao_any_destructor (void *x)
@@ -69212,7 +28903,7 @@
{
if (
(!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/HomeDef:1.0")) ||
-@@ -53982,70 +29701,70 @@
+@@ -54624,70 +53922,70 @@
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
@@ -69295,7 +28986,7 @@
this
)
);
-@@ -54058,12 +29777,12 @@
+@@ -54700,12 +53998,12 @@
return retv;
}
@@ -69310,7 +29001,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -54077,7 +29796,7 @@
+@@ -54722,7 +54020,7 @@
);
}
@@ -69319,7 +29010,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -54091,7 +29810,7 @@
+@@ -54739,7 +54037,7 @@
);
}
@@ -69328,7 +29019,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -54105,7 +29824,7 @@
+@@ -54756,7 +54054,7 @@
);
}
@@ -69337,7 +29028,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -54119,7 +29838,7 @@
+@@ -54773,7 +54071,7 @@
);
}
@@ -69346,7 +29037,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -54133,7 +29852,7 @@
+@@ -54790,7 +54088,7 @@
);
}
@@ -69355,7 +29046,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -54147,11 +29866,11 @@
+@@ -54807,11 +54105,11 @@
);
}
@@ -69369,7 +29060,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -54169,12 +29888,12 @@
+@@ -54832,12 +54130,12 @@
);
}
@@ -69385,7 +29076,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -54193,12 +29912,12 @@
+@@ -54859,12 +54157,12 @@
);
}
@@ -69401,626 +29092,426 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -54217,633 +29936,18 @@
+@@ -54886,9 +54184,8 @@
);
}
-
--#if (TAO_HAS_INTERCEPTORS == 1)
+ #if (TAO_HAS_INTERCEPTORS == 1)
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::TAO_ClientRequestInfo_IR_HomeDef_base_home_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::TAO_ClientRequestInfo_IR_HomeDef_base_home_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -54897,7 +54194,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -54909,7 +54206,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -54922,7 +54219,7 @@
+
+
+ CORBA::Any *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -54938,13 +54235,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -54953,7 +54250,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -54965,7 +54262,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -54978,7 +54275,7 @@
+
+
+ CORBA::Any *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -54994,13 +54291,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -55009,7 +54306,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -55021,7 +54318,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -55034,7 +54331,7 @@
+
+
+ CORBA::Any *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -55050,13 +54347,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::TAO_ClientRequestInfo_IR_HomeDef_factories_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -55065,7 +54362,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -55077,7 +54374,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -55090,7 +54387,7 @@
+
+
+ CORBA::Any *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -55106,13 +54403,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::TAO_ClientRequestInfo_IR_HomeDef_finders_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -55121,7 +54418,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -55133,7 +54430,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -55146,7 +54443,7 @@
+
+
+ CORBA::Any *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -55162,13 +54459,13 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
--{}
--
--Dynamic::ParameterList *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ CORBA::Environment &
+@@ -55177,7 +54474,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return parameter_list;
--}
--
--Dynamic::ExceptionList *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -55189,7 +54486,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -55202,7 +54499,7 @@
+
+
+ CORBA::Any *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-- return safe_result_any._retn ();
--}
--
--void
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -55218,19 +54515,19 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * id,
+ const char * name,
+ const char * version,
- IR::ValueDef_ptr primary_key,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- primary_key_ (primary_key)
--{}
--
--Dynamic::ParameterList *
++ IR_ValueDef_ptr primary_key,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -55241,7 +54538,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_primary_key = parameter_list->length ();
-- parameter_list->length (length_primary_key + 1);
-- (*parameter_list)[length_primary_key].argument <<= this->primary_key_;
--
-- (*parameter_list)[length_primary_key].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -55276,7 +54573,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -55289,7 +54586,7 @@
+
+
+ CORBA::Any *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -55305,20 +54602,20 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::TAO_ClientRequestInfo_IR_HomeDef_create_factory (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * id,
+ const char * name,
+ const char * version,
- const IR::ParDescriptionSeq & params,
- const IR::ExceptionDefSeq & exceptions,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- params_ (params),
-- exceptions_ (exceptions)
--{}
--
--Dynamic::ParameterList *
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -55330,7 +54627,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_params = parameter_list->length ();
-- parameter_list->length (length_params + 1);
-- (*parameter_list)[length_params].argument <<= this->params_;
--
-- (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_exceptions = parameter_list->length ();
-- parameter_list->length (length_exceptions + 1);
-- (*parameter_list)[length_exceptions].argument <<= this->exceptions_;
--
-- (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -55371,7 +54668,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -55384,7 +54681,7 @@
+
+
+ CORBA::Any *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -55400,20 +54697,20 @@
+ }
+
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::TAO_ClientRequestInfo_IR_HomeDef_create_finder (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
+ const char * id,
+ const char * name,
+ const char * version,
- const IR::ParDescriptionSeq & params,
- const IR::ExceptionDefSeq & exceptions,
-- CORBA::Environment &
-- )
-- : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-- id_ (id),
-- name_ (name),
-- version_ (version),
-- params_ (params),
-- exceptions_ (exceptions)
--{}
--
--Dynamic::ParameterList *
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &
+ )
+ : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+@@ -55425,7 +54722,7 @@
+ {}
+
+ Dynamic::ParameterList *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::arguments (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the argument list on demand.
-- Dynamic::ParameterList *parameter_list =
-- TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--
-- CORBA::ULong length_id = parameter_list->length ();
-- parameter_list->length (length_id + 1);
-- (*parameter_list)[length_id].argument <<= id_;
-- (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_name = parameter_list->length ();
-- parameter_list->length (length_name + 1);
-- (*parameter_list)[length_name].argument <<= name_;
-- (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_version = parameter_list->length ();
-- parameter_list->length (length_version + 1);
-- (*parameter_list)[length_version].argument <<= version_;
-- (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_params = parameter_list->length ();
-- parameter_list->length (length_params + 1);
-- (*parameter_list)[length_params].argument <<= this->params_;
--
-- (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
--
-- CORBA::ULong length_exceptions = parameter_list->length ();
-- parameter_list->length (length_exceptions + 1);
-- (*parameter_list)[length_exceptions].argument <<= this->exceptions_;
--
-- (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
--
-- return safe_parameter_list._retn ();
--}
--
--Dynamic::ExceptionList *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::arguments (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the argument list on demand.
+@@ -55466,7 +54763,7 @@
+ }
+
+ Dynamic::ExceptionList *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::exceptions (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the exception list on demand.
-- Dynamic::ExceptionList *exception_list =
-- TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- return exception_list;
--}
--
--
--CORBA::Any *
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::exceptions (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the exception list on demand.
+@@ -55479,7 +54776,7 @@
+
+
+ CORBA::Any *
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (CORBA::Environment &ACE_TRY_ENV)
-- ACE_THROW_SPEC ((CORBA::SystemException))
--{
-- // Generate the result on demand.
-- CORBA::Boolean tk_void_any = 0;
-- CORBA::Any *result_any =
-- TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-- ACE_CHECK_RETURN (0);
--
-- CORBA::Any_var safe_result_any = result_any;
--
-- (*result_any) <<= this->_result;
-- return safe_result_any._retn ();
--}
--
--void
++IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (CORBA::Environment &ACE_TRY_ENV)
+ ACE_THROW_SPEC ((CORBA::SystemException))
+ {
+ // Generate the result on demand.
+@@ -55495,24 +54792,26 @@
+ }
+
+ void
-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (IR::FinderDef_ptr result)
--{
-- // update the result
-- this->_result = result;
--}
--
--#endif /* TAO_HAS_INTERCEPTORS */
++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
@@ -70038,7 +29529,7 @@
static const CORBA::Long _oc_IR_HomeDescription[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -54909,14 +30013,14 @@
+@@ -55578,14 +54877,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
@@ -70055,7 +29546,7 @@
CORBA::tk_sequence, // typecode kind
72, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -54924,7 +30028,7 @@
+@@ -55593,7 +54892,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
@@ -70064,7 +29555,7 @@
0U,
-@@ -54934,7 +30038,7 @@
+@@ -55603,7 +54902,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
@@ -70073,7 +29564,7 @@
CORBA::tk_sequence, // typecode kind
72, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -54942,7 +30046,7 @@
+@@ -55611,7 +54910,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
@@ -70082,7 +29573,7 @@
0U,
-@@ -55069,7 +30173,7 @@
+@@ -55738,7 +55037,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
@@ -70091,7 +29582,7 @@
5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
CORBA::tk_enum, // typecode kind
-@@ -55336,18 +30440,19 @@
+@@ -56005,18 +55304,19 @@
CORBA::tk_boolean,
};
@@ -70115,7 +29606,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -55358,7 +30463,7 @@
+@@ -56027,18 +55327,16 @@
);
}
@@ -70124,21 +29615,31 @@
{
ACE_TRY_NEW_ENV
{
-@@ -55385,11 +30490,11 @@
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_DefinitionKind, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_DefinitionKind, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -56056,7 +55354,7 @@
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)
-@@ -55399,17 +30504,17 @@
+@@ -56066,25 +55364,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -70158,9 +29659,21 @@
- _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
- {
-@@ -55426,33 +30531,33 @@
+-
+- CORBA::Boolean result = type->equivalent (CORBA::_tc_IRObject, ACE_TRY_ENV);
++ if (!type->equivalent (CORBA::_tc_IRObject, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -56095,29 +55391,29 @@
CORBA::_tc_IRObject,
1,
_tao_elem,
@@ -70185,23 +29698,18 @@
#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>;
++ 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>
++ # 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)
-@@ -55462,17 +30567,17 @@
+@@ -56127,25 +55423,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -70221,9 +29729,21 @@
- _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
- {
-@@ -55489,65 +30594,65 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_Contained, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_Contained, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -56156,83 +55450,81 @@
IR::_tc_Contained,
1,
_tao_elem,
@@ -70298,12 +29818,17 @@
ACE_TRY_NEW_ENV
{
CORBA::TypeCode_var type = _tao_any.type ();
-- if (!type->equivalent (IR::Contained::_tc_Description, ACE_TRY_ENV)) // not equal
+-
+- CORBA::Boolean result = type->equivalent (IR::Contained::_tc_Description, ACE_TRY_ENV);
+ if (!type->equivalent (IR_Contained::_tc_Description, ACE_TRY_ENV)) // not equal
- {
- return 0;
- }
-@@ -55555,15 +30660,15 @@
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -70322,7 +29847,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -55571,10 +30676,10 @@
+@@ -56240,10 +55532,10 @@
if (stream >> *tmp)
{
((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -70335,7 +29860,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -55594,7 +30699,7 @@
+@@ -56263,7 +55555,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -70344,7 +29869,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -55608,7 +30713,7 @@
+@@ -56277,7 +55569,7 @@
}
}
@@ -70353,7 +29878,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -55618,19 +30723,19 @@
+@@ -56287,43 +55579,41 @@
stream.begin (),
1,
_tao_elem,
@@ -70377,7 +29902,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -55644,15 +30749,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_InterfaceDefSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_InterfaceDefSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -70396,7 +29933,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -55663,7 +30768,7 @@
+@@ -56334,7 +55624,7 @@
IR::_tc_InterfaceDefSeq,
1,
ACE_static_cast (void *, tmp),
@@ -70405,7 +29942,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -55683,7 +30788,7 @@
+@@ -56354,7 +55644,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -70414,7 +29951,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -55697,7 +30802,7 @@
+@@ -56368,7 +55658,7 @@
}
}
@@ -70423,7 +29960,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -55707,19 +30812,19 @@
+@@ -56378,43 +55668,41 @@
stream.begin (),
1,
_tao_elem,
@@ -70447,7 +29984,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -55733,15 +30838,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ValueDefSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ValueDefSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -70466,7 +30015,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -55752,7 +30857,7 @@
+@@ -56425,7 +55713,7 @@
IR::_tc_ValueDefSeq,
1,
ACE_static_cast (void *, tmp),
@@ -70475,7 +30024,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -55772,7 +30877,7 @@
+@@ -56445,7 +55733,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -70484,7 +30033,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -55786,7 +30891,7 @@
+@@ -56459,7 +55747,7 @@
}
}
@@ -70493,7 +30042,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -55796,19 +30901,19 @@
+@@ -56469,43 +55757,41 @@
stream.begin (),
1,
_tao_elem,
@@ -70517,7 +30066,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -55822,15 +30927,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDefSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ComponentDefSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -70536,7 +30097,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -55841,7 +30946,7 @@
+@@ -56516,7 +55802,7 @@
IR::_tc_ComponentDefSeq,
1,
ACE_static_cast (void *, tmp),
@@ -70545,7 +30106,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -55861,7 +30966,7 @@
+@@ -56536,7 +55822,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -70554,7 +30115,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -55875,7 +30980,7 @@
+@@ -56550,7 +55836,7 @@
}
}
@@ -70563,7 +30124,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -55885,19 +30990,19 @@
+@@ -56560,43 +55846,41 @@
stream.begin (),
1,
_tao_elem,
@@ -70587,7 +30148,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -55911,15 +31016,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDefSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ProvidesDefSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -70606,7 +30179,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -55930,7 +31035,7 @@
+@@ -56607,7 +55891,7 @@
IR::_tc_ProvidesDefSeq,
1,
ACE_static_cast (void *, tmp),
@@ -70615,7 +30188,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -55950,7 +31055,7 @@
+@@ -56627,7 +55911,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -70624,7 +30197,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -55964,7 +31069,7 @@
+@@ -56641,7 +55925,7 @@
}
}
@@ -70633,7 +30206,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -55974,19 +31079,19 @@
+@@ -56651,43 +55935,41 @@
stream.begin (),
1,
_tao_elem,
@@ -70657,7 +30230,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -56000,15 +31105,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_UsesDefSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_UsesDefSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -70676,7 +30261,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -56019,7 +31124,7 @@
+@@ -56698,7 +55980,7 @@
IR::_tc_UsesDefSeq,
1,
ACE_static_cast (void *, tmp),
@@ -70685,7 +30270,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -56039,7 +31144,7 @@
+@@ -56718,7 +56000,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -70694,7 +30279,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -56053,7 +31158,7 @@
+@@ -56732,7 +56014,7 @@
}
}
@@ -70703,7 +30288,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -56063,19 +31168,19 @@
+@@ -56742,43 +56024,41 @@
stream.begin (),
1,
_tao_elem,
@@ -70727,7 +30312,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -56089,15 +31194,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_HomeDefSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_HomeDefSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -70746,7 +30343,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -56108,7 +31213,7 @@
+@@ -56789,7 +56069,7 @@
IR::_tc_HomeDefSeq,
1,
ACE_static_cast (void *, tmp),
@@ -70755,7 +30352,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -56128,7 +31233,7 @@
+@@ -56809,7 +56089,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -70764,7 +30361,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -56142,7 +31247,7 @@
+@@ -56823,7 +56103,7 @@
}
}
@@ -70773,7 +30370,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -56152,19 +31257,19 @@
+@@ -56833,43 +56113,41 @@
stream.begin (),
1,
_tao_elem,
@@ -70797,7 +30394,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -56178,15 +31283,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_EmitsDefSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_EmitsDefSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -70816,7 +30425,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -56197,7 +31302,7 @@
+@@ -56880,7 +56158,7 @@
IR::_tc_EmitsDefSeq,
1,
ACE_static_cast (void *, tmp),
@@ -70825,7 +30434,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -56217,7 +31322,7 @@
+@@ -56900,7 +56178,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -70834,7 +30443,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -56231,7 +31336,7 @@
+@@ -56914,7 +56192,7 @@
}
}
@@ -70843,7 +30452,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -56241,19 +31346,19 @@
+@@ -56924,43 +56202,41 @@
stream.begin (),
1,
_tao_elem,
@@ -70867,7 +30476,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -56267,15 +31372,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_PublishesDefSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_PublishesDefSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -70886,7 +30507,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -56286,7 +31391,7 @@
+@@ -56971,7 +56247,7 @@
IR::_tc_PublishesDefSeq,
1,
ACE_static_cast (void *, tmp),
@@ -70895,7 +30516,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -56306,7 +31411,7 @@
+@@ -56991,7 +56267,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -70904,7 +30525,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -56320,7 +31425,7 @@
+@@ -57005,7 +56281,7 @@
}
}
@@ -70913,7 +30534,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -56330,19 +31435,19 @@
+@@ -57015,43 +56291,41 @@
stream.begin (),
1,
_tao_elem,
@@ -70937,7 +30558,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -56356,15 +31461,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ConsumesDefSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ConsumesDefSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -70956,7 +30589,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -56375,7 +31480,7 @@
+@@ -57062,7 +56336,7 @@
IR::_tc_ConsumesDefSeq,
1,
ACE_static_cast (void *, tmp),
@@ -70965,7 +30598,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -56395,7 +31500,7 @@
+@@ -57082,7 +56356,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -70974,7 +30607,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -56409,7 +31514,7 @@
+@@ -57096,7 +56370,7 @@
}
}
@@ -70983,7 +30616,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -56419,19 +31524,19 @@
+@@ -57106,43 +56380,41 @@
stream.begin (),
1,
_tao_elem,
@@ -71007,7 +30640,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -56445,15 +31550,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_FactoryDefSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_FactoryDefSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -71026,7 +30671,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -56464,7 +31569,7 @@
+@@ -57153,7 +56425,7 @@
IR::_tc_FactoryDefSeq,
1,
ACE_static_cast (void *, tmp),
@@ -71035,7 +30680,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -56484,7 +31589,7 @@
+@@ -57173,7 +56445,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -71044,7 +30689,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -56498,7 +31603,7 @@
+@@ -57187,7 +56459,7 @@
}
}
@@ -71053,7 +30698,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -56508,19 +31613,19 @@
+@@ -57197,43 +56469,41 @@
stream.begin (),
1,
_tao_elem,
@@ -71077,7 +30722,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -56534,15 +31639,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_FinderDefSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_FinderDefSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -71096,7 +30753,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -56553,7 +31658,7 @@
+@@ -57244,7 +56514,7 @@
IR::_tc_FinderDefSeq,
1,
ACE_static_cast (void *, tmp),
@@ -71105,7 +30762,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -56573,7 +31678,7 @@
+@@ -57264,7 +56534,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -71114,7 +30771,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -56587,7 +31692,7 @@
+@@ -57278,7 +56548,7 @@
}
}
@@ -71123,7 +30780,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -56597,19 +31702,19 @@
+@@ -57288,43 +56558,41 @@
stream.begin (),
1,
_tao_elem,
@@ -71147,7 +30804,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -56623,15 +31728,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ContainedSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ContainedSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -71166,7 +30835,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -56642,7 +31747,7 @@
+@@ -57335,7 +56603,7 @@
IR::_tc_ContainedSeq,
1,
ACE_static_cast (void *, tmp),
@@ -71175,7 +30844,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -56660,7 +31765,7 @@
+@@ -57353,7 +56621,7 @@
return 0;
}
@@ -71184,7 +30853,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -56671,7 +31776,7 @@
+@@ -57364,7 +56632,7 @@
);
}
@@ -71193,7 +30862,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -56681,16 +31786,16 @@
+@@ -57374,40 +56642,38 @@
stream.begin (),
1,
_tao_elem,
@@ -71214,7 +30883,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -56704,15 +31809,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_StructMember, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_StructMember, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -71233,7 +30914,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -56723,7 +31828,7 @@
+@@ -57418,7 +56684,7 @@
IR::_tc_StructMember,
1,
ACE_static_cast (void *, tmp),
@@ -71242,7 +30923,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -56743,7 +31848,7 @@
+@@ -57438,7 +56704,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -71251,7 +30932,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -56757,7 +31862,7 @@
+@@ -57452,7 +56718,7 @@
}
}
@@ -71260,7 +30941,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -56767,19 +31872,19 @@
+@@ -57462,43 +56728,41 @@
stream.begin (),
1,
_tao_elem,
@@ -71284,7 +30965,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -56793,15 +31898,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_StructMemberSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_StructMemberSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -71303,7 +30996,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -56812,7 +31917,7 @@
+@@ -57509,7 +56773,7 @@
IR::_tc_StructMemberSeq,
1,
ACE_static_cast (void *, tmp),
@@ -71312,7 +31005,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -56830,7 +31935,7 @@
+@@ -57527,7 +56791,7 @@
return 0;
}
@@ -71321,7 +31014,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -56841,7 +31946,7 @@
+@@ -57538,7 +56802,7 @@
);
}
@@ -71330,7 +31023,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -56851,16 +31956,16 @@
+@@ -57548,40 +56812,38 @@
stream.begin (),
1,
_tao_elem,
@@ -71351,7 +31044,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -56874,15 +31979,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_Initializer, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_Initializer, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -71370,7 +31075,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -56893,7 +31998,7 @@
+@@ -57592,7 +56854,7 @@
IR::_tc_Initializer,
1,
ACE_static_cast (void *, tmp),
@@ -71379,7 +31084,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -56913,7 +32018,7 @@
+@@ -57612,7 +56874,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -71388,7 +31093,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -56927,7 +32032,7 @@
+@@ -57626,7 +56888,7 @@
}
}
@@ -71397,7 +31102,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -56937,19 +32042,19 @@
+@@ -57636,43 +56898,41 @@
stream.begin (),
1,
_tao_elem,
@@ -71421,7 +31126,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -56963,15 +32068,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_InitializerSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_InitializerSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -71440,7 +31157,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -56982,7 +32087,7 @@
+@@ -57683,7 +56943,7 @@
IR::_tc_InitializerSeq,
1,
ACE_static_cast (void *, tmp),
@@ -71449,7 +31166,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -57000,7 +32105,7 @@
+@@ -57701,7 +56961,7 @@
return 0;
}
@@ -71458,7 +31175,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -57011,7 +32116,7 @@
+@@ -57712,7 +56972,7 @@
);
}
@@ -71467,7 +31184,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -57021,16 +32126,16 @@
+@@ -57722,40 +56982,38 @@
stream.begin (),
1,
_tao_elem,
@@ -71488,7 +31205,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -57044,15 +32149,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_UnionMember, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_UnionMember, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -71507,7 +31236,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -57063,7 +32168,7 @@
+@@ -57766,7 +57024,7 @@
IR::_tc_UnionMember,
1,
ACE_static_cast (void *, tmp),
@@ -71516,7 +31245,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -57083,7 +32188,7 @@
+@@ -57786,7 +57044,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -71525,7 +31254,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -57097,7 +32202,7 @@
+@@ -57800,7 +57058,7 @@
}
}
@@ -71534,7 +31263,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -57107,19 +32212,19 @@
+@@ -57810,43 +57068,41 @@
stream.begin (),
1,
_tao_elem,
@@ -71558,7 +31287,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -57133,15 +32238,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_UnionMemberSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_UnionMemberSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -71577,7 +31318,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -57152,7 +32257,7 @@
+@@ -57857,7 +57113,7 @@
IR::_tc_UnionMemberSeq,
1,
ACE_static_cast (void *, tmp),
@@ -71586,7 +31327,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -57172,7 +32277,7 @@
+@@ -57877,7 +57133,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -71595,7 +31336,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -57186,7 +32291,7 @@
+@@ -57891,7 +57147,7 @@
}
}
@@ -71604,7 +31345,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -57196,19 +32301,19 @@
+@@ -57901,43 +57157,41 @@
stream.begin (),
1,
_tao_elem,
@@ -71628,7 +31369,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -57222,15 +32327,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_EnumMemberSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_EnumMemberSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -71647,7 +31400,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -57241,7 +32346,7 @@
+@@ -57948,7 +57202,7 @@
IR::_tc_EnumMemberSeq,
1,
ACE_static_cast (void *, tmp),
@@ -71656,21 +31409,16 @@
);
_tao_elem = tmp;
return 1;
-@@ -57259,11 +32364,11 @@
+@@ -57966,7 +57220,7 @@
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)
-@@ -57273,17 +32378,17 @@
+@@ -57976,25 +57230,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -71690,9 +31438,21 @@
- _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
- {
-@@ -57300,65 +32405,65 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_Container, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_Container, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -58005,83 +57257,81 @@
IR::_tc_Container,
1,
_tao_elem,
@@ -71767,12 +31527,17 @@
ACE_TRY_NEW_ENV
{
CORBA::TypeCode_var type = _tao_any.type ();
-- if (!type->equivalent (IR::Container::_tc_Description, ACE_TRY_ENV)) // not equal
+-
+- CORBA::Boolean result = type->equivalent (IR::Container::_tc_Description, ACE_TRY_ENV);
+ if (!type->equivalent (IR_Container::_tc_Description, ACE_TRY_ENV)) // not equal
- {
- return 0;
- }
-@@ -57366,15 +32471,15 @@
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -71791,7 +31556,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -57382,10 +32487,10 @@
+@@ -58089,10 +57339,10 @@
if (stream >> *tmp)
{
((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -71804,7 +31569,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -57405,49 +32510,49 @@
+@@ -58112,67 +57362,65 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -71858,12 +31623,17 @@
ACE_TRY_NEW_ENV
{
CORBA::TypeCode_var type = _tao_any.type ();
-- if (!type->equivalent (IR::Container::_tc_DescriptionSeq, ACE_TRY_ENV)) // not equal
+-
+- CORBA::Boolean result = type->equivalent (IR::Container::_tc_DescriptionSeq, ACE_TRY_ENV);
+ if (!type->equivalent (IR_Container::_tc_DescriptionSeq, ACE_TRY_ENV)) // not equal
- {
- return 0;
- }
-@@ -57455,15 +32560,15 @@
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -71882,7 +31652,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -57471,10 +32576,10 @@
+@@ -58180,10 +57428,10 @@
if (stream >> *tmp)
{
((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -71895,21 +31665,16 @@
);
_tao_elem = tmp;
return 1;
-@@ -57492,11 +32597,11 @@
+@@ -58201,7 +57449,7 @@
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)
-@@ -57506,17 +32611,17 @@
+@@ -58211,25 +57459,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -71929,9 +31694,21 @@
- _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
- {
-@@ -57533,29 +32638,29 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_IDLType, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_IDLType, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -58240,29 +57486,29 @@
IR::_tc_IDLType,
1,
_tao_elem,
@@ -71967,7 +31744,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -57566,7 +32671,7 @@
+@@ -58273,18 +57519,16 @@
);
}
@@ -71976,21 +31753,31 @@
{
ACE_TRY_NEW_ENV
{
-@@ -57593,11 +32698,11 @@
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_PrimitiveKind, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_PrimitiveKind, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -58302,7 +57546,7 @@
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)
-@@ -57607,17 +32712,17 @@
+@@ -58312,25 +57556,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -72010,9 +31797,21 @@
- _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
- {
-@@ -57634,33 +32739,33 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_Repository, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_Repository, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -58341,29 +57583,29 @@
IR::_tc_Repository,
1,
_tao_elem,
@@ -72043,17 +31842,12 @@
+ # 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)
-@@ -57670,17 +32775,17 @@
+@@ -58373,25 +57615,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -72073,9 +31867,21 @@
- _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
- {
-@@ -57697,33 +32802,33 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ComponentRepository, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ComponentRepository, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -58402,29 +57642,29 @@
IR::_tc_ComponentRepository,
1,
_tao_elem,
@@ -72106,17 +31912,12 @@
+ # 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)
-@@ -57733,17 +32838,17 @@
+@@ -58434,25 +57674,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -72136,9 +31937,21 @@
- _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
- {
-@@ -57760,29 +32865,29 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ModuleDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ModuleDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -58463,29 +57701,29 @@
IR::_tc_ModuleDef,
1,
_tao_elem,
@@ -72174,7 +31987,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -57793,7 +32898,7 @@
+@@ -58496,7 +57734,7 @@
);
}
@@ -72183,7 +31996,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -57803,16 +32908,16 @@
+@@ -58506,40 +57744,38 @@
stream.begin (),
1,
_tao_elem,
@@ -72204,7 +32017,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -57826,15 +32931,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ModuleDescription, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ModuleDescription, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -72223,7 +32048,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -57845,7 +32950,7 @@
+@@ -58550,7 +57786,7 @@
IR::_tc_ModuleDescription,
1,
ACE_static_cast (void *, tmp),
@@ -72232,21 +32057,16 @@
);
_tao_elem = tmp;
return 1;
-@@ -57863,11 +32968,11 @@
+@@ -58568,7 +57804,7 @@
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)
-@@ -57877,17 +32982,17 @@
+@@ -58578,25 +57814,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -72266,9 +32086,21 @@
- _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
- {
-@@ -57904,29 +33009,29 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ConstantDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ConstantDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -58607,29 +57841,29 @@
IR::_tc_ConstantDef,
1,
_tao_elem,
@@ -72304,7 +32136,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -57937,7 +33042,7 @@
+@@ -58640,7 +57874,7 @@
);
}
@@ -72313,7 +32145,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -57947,16 +33052,16 @@
+@@ -58650,40 +57884,38 @@
stream.begin (),
1,
_tao_elem,
@@ -72334,7 +32166,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -57970,15 +33075,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ConstantDescription, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ConstantDescription, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -72353,7 +32197,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -57989,7 +33094,7 @@
+@@ -58694,7 +57926,7 @@
IR::_tc_ConstantDescription,
1,
ACE_static_cast (void *, tmp),
@@ -72362,21 +32206,16 @@
);
_tao_elem = tmp;
return 1;
-@@ -58007,11 +33112,11 @@
+@@ -58712,7 +57944,7 @@
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)
-@@ -58021,17 +33126,17 @@
+@@ -58722,25 +57954,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -72396,9 +32235,21 @@
- _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
- {
-@@ -58048,29 +33153,29 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_TypedefDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_TypedefDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -58751,29 +57981,29 @@
IR::_tc_TypedefDef,
1,
_tao_elem,
@@ -72434,7 +32285,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -58081,7 +33186,7 @@
+@@ -58784,7 +58014,7 @@
);
}
@@ -72443,7 +32294,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -58091,16 +33196,16 @@
+@@ -58794,40 +58024,38 @@
stream.begin (),
1,
_tao_elem,
@@ -72464,7 +32315,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -58114,15 +33219,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_TypeDescription, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_TypeDescription, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -72483,7 +32346,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -58133,7 +33238,7 @@
+@@ -58838,7 +58066,7 @@
IR::_tc_TypeDescription,
1,
ACE_static_cast (void *, tmp),
@@ -72492,21 +32355,16 @@
);
_tao_elem = tmp;
return 1;
-@@ -58151,11 +33256,11 @@
+@@ -58856,7 +58084,7 @@
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)
-@@ -58165,17 +33270,17 @@
+@@ -58866,25 +58094,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -72526,9 +32384,21 @@
- _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
- {
-@@ -58192,33 +33297,33 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_StructDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_StructDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -58895,29 +58121,29 @@
IR::_tc_StructDef,
1,
_tao_elem,
@@ -72559,17 +32429,12 @@
+ # 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)
-@@ -58228,17 +33333,17 @@
+@@ -58927,25 +58153,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -72589,9 +32454,21 @@
- _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
- {
-@@ -58255,33 +33360,33 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_UnionDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_UnionDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -58956,29 +58180,29 @@
IR::_tc_UnionDef,
1,
_tao_elem,
@@ -72622,17 +32499,12 @@
+ # 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)
-@@ -58291,17 +33396,17 @@
+@@ -58988,25 +58212,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -72652,9 +32524,21 @@
- _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
- {
-@@ -58318,33 +33423,33 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_EnumDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_EnumDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -59017,29 +58239,29 @@
IR::_tc_EnumDef,
1,
_tao_elem,
@@ -72685,17 +32569,12 @@
+ # 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)
-@@ -58354,17 +33459,17 @@
+@@ -59049,25 +58271,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -72715,9 +32594,21 @@
- _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
- {
-@@ -58381,33 +33486,33 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_AliasDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_AliasDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -59078,29 +58298,29 @@
IR::_tc_AliasDef,
1,
_tao_elem,
@@ -72748,17 +32639,12 @@
+ # 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)
-@@ -58417,17 +33522,17 @@
+@@ -59110,25 +58330,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -72778,9 +32664,21 @@
- _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
- {
-@@ -58444,33 +33549,33 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_NativeDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_NativeDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -59139,29 +58357,29 @@
IR::_tc_NativeDef,
1,
_tao_elem,
@@ -72811,17 +32709,12 @@
+ # 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)
-@@ -58480,17 +33585,17 @@
+@@ -59171,25 +58389,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -72841,9 +32734,21 @@
- _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
- {
-@@ -58507,33 +33612,33 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_PrimitiveDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_PrimitiveDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -59200,29 +58416,29 @@
IR::_tc_PrimitiveDef,
1,
_tao_elem,
@@ -72874,17 +32779,12 @@
+ # 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)
-@@ -58543,17 +33648,17 @@
+@@ -59232,25 +58448,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -72904,9 +32804,21 @@
- _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
- {
-@@ -58570,33 +33675,33 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_StringDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_StringDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -59261,29 +58475,29 @@
IR::_tc_StringDef,
1,
_tao_elem,
@@ -72937,17 +32849,12 @@
+ # 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)
-@@ -58606,17 +33711,17 @@
+@@ -59293,25 +58507,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -72967,9 +32874,21 @@
- _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
- {
-@@ -58633,33 +33738,33 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_WstringDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_WstringDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -59322,29 +58534,29 @@
IR::_tc_WstringDef,
1,
_tao_elem,
@@ -73000,17 +32919,12 @@
+ # 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)
-@@ -58669,17 +33774,17 @@
+@@ -59354,25 +58566,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -73030,9 +32944,21 @@
- _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
- {
-@@ -58696,33 +33801,33 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_FixedDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_FixedDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -59383,29 +58593,29 @@
IR::_tc_FixedDef,
1,
_tao_elem,
@@ -73063,17 +32989,12 @@
+ # 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)
-@@ -58732,17 +33837,17 @@
+@@ -59415,25 +58625,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -73093,9 +33014,21 @@
- _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
- {
-@@ -58759,33 +33864,33 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_SequenceDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_SequenceDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -59444,29 +58652,29 @@
IR::_tc_SequenceDef,
1,
_tao_elem,
@@ -73126,17 +33059,12 @@
+ # 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)
-@@ -58795,17 +33900,17 @@
+@@ -59476,25 +58684,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -73156,9 +33084,21 @@
- _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
- {
-@@ -58822,33 +33927,33 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ArrayDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ArrayDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -59505,29 +58711,29 @@
IR::_tc_ArrayDef,
1,
_tao_elem,
@@ -73189,17 +33129,12 @@
+ # 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)
-@@ -58858,17 +33963,17 @@
+@@ -59537,25 +58743,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -73219,9 +33154,21 @@
- _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
- {
-@@ -58885,29 +33990,29 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ExceptionDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ExceptionDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -59566,29 +58770,29 @@
IR::_tc_ExceptionDef,
1,
_tao_elem,
@@ -73257,7 +33204,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -58918,7 +34023,7 @@
+@@ -59599,7 +58803,7 @@
);
}
@@ -73266,7 +33213,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -58928,16 +34033,16 @@
+@@ -59609,40 +58813,38 @@
stream.begin (),
1,
_tao_elem,
@@ -73287,7 +33234,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -58951,15 +34056,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ExceptionDescription, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ExceptionDescription, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -73306,7 +33265,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -58970,7 +34075,7 @@
+@@ -59653,7 +58855,7 @@
IR::_tc_ExceptionDescription,
1,
ACE_static_cast (void *, tmp),
@@ -73315,7 +33274,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -58990,7 +34095,7 @@
+@@ -59673,7 +58875,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -73324,7 +33283,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -59004,7 +34109,7 @@
+@@ -59687,7 +58889,7 @@
}
}
@@ -73333,7 +33292,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -59014,19 +34119,19 @@
+@@ -59697,43 +58899,41 @@
stream.begin (),
1,
_tao_elem,
@@ -73357,7 +33316,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -59040,15 +34145,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ExceptionDefSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ExceptionDefSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -73376,7 +33347,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -59059,7 +34164,7 @@
+@@ -59744,7 +58944,7 @@
IR::_tc_ExceptionDefSeq,
1,
ACE_static_cast (void *, tmp),
@@ -73385,7 +33356,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -59079,7 +34184,7 @@
+@@ -59764,7 +58964,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -73394,7 +33365,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -59093,7 +34198,7 @@
+@@ -59778,7 +58978,7 @@
}
}
@@ -73403,7 +33374,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -59103,19 +34208,19 @@
+@@ -59788,43 +58988,41 @@
stream.begin (),
1,
_tao_elem,
@@ -73427,7 +33398,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -59129,15 +34234,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ExcDescriptionSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ExcDescriptionSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -73446,7 +33429,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -59148,7 +34253,7 @@
+@@ -59835,7 +59033,7 @@
IR::_tc_ExcDescriptionSeq,
1,
ACE_static_cast (void *, tmp),
@@ -73455,7 +33438,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -59166,7 +34271,7 @@
+@@ -59853,7 +59051,7 @@
return 0;
}
@@ -73464,7 +33447,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -59177,7 +34282,7 @@
+@@ -59864,18 +59062,16 @@
);
}
@@ -73473,21 +33456,31 @@
{
ACE_TRY_NEW_ENV
{
-@@ -59204,11 +34309,11 @@
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_AttributeMode, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_AttributeMode, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -59893,7 +59089,7 @@
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)
-@@ -59218,17 +34323,17 @@
+@@ -59903,25 +59099,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -73507,9 +33500,21 @@
- _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
- {
-@@ -59245,29 +34350,29 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_AttributeDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_AttributeDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -59932,29 +59126,29 @@
IR::_tc_AttributeDef,
1,
_tao_elem,
@@ -73545,7 +33550,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -59278,7 +34383,7 @@
+@@ -59965,7 +59159,7 @@
);
}
@@ -73554,7 +33559,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -59288,16 +34393,16 @@
+@@ -59975,40 +59169,38 @@
stream.begin (),
1,
_tao_elem,
@@ -73575,7 +33580,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -59311,15 +34416,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_AttributeDescription, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_AttributeDescription, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -73594,7 +33611,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -59330,7 +34435,7 @@
+@@ -60019,7 +59211,7 @@
IR::_tc_AttributeDescription,
1,
ACE_static_cast (void *, tmp),
@@ -73603,7 +33620,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -59348,7 +34453,7 @@
+@@ -60037,7 +59229,7 @@
return 0;
}
@@ -73612,7 +33629,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -59359,7 +34464,7 @@
+@@ -60048,18 +59240,16 @@
);
}
@@ -73621,7 +33638,22 @@
{
ACE_TRY_NEW_ENV
{
-@@ -59386,7 +34491,7 @@
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_OperationMode, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_OperationMode, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -60077,7 +59267,7 @@
return 0;
}
@@ -73630,7 +33662,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -59397,7 +34502,7 @@
+@@ -60088,18 +59278,16 @@
);
}
@@ -73639,7 +33671,22 @@
{
ACE_TRY_NEW_ENV
{
-@@ -59424,7 +34529,7 @@
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ParameterMode, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ParameterMode, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -60117,7 +59305,7 @@
return 0;
}
@@ -73648,7 +33695,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -59435,7 +34540,7 @@
+@@ -60128,7 +59316,7 @@
);
}
@@ -73657,7 +33704,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -59445,16 +34550,16 @@
+@@ -60138,40 +59326,38 @@
stream.begin (),
1,
_tao_elem,
@@ -73678,7 +33725,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -59468,15 +34573,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ParameterDescription, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ParameterDescription, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -73697,7 +33756,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -59487,7 +34592,7 @@
+@@ -60182,7 +59368,7 @@
IR::_tc_ParameterDescription,
1,
ACE_static_cast (void *, tmp),
@@ -73706,7 +33765,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -59507,7 +34612,7 @@
+@@ -60202,7 +59388,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -73715,7 +33774,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -59521,7 +34626,7 @@
+@@ -60216,7 +59402,7 @@
}
}
@@ -73724,7 +33783,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -59531,19 +34636,19 @@
+@@ -60226,43 +59412,41 @@
stream.begin (),
1,
_tao_elem,
@@ -73748,7 +33807,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -59557,15 +34662,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ParDescriptionSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ParDescriptionSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -73767,7 +33838,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -59576,7 +34681,7 @@
+@@ -60273,7 +59457,7 @@
IR::_tc_ParDescriptionSeq,
1,
ACE_static_cast (void *, tmp),
@@ -73776,7 +33847,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -59596,7 +34701,7 @@
+@@ -60293,7 +59477,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -73785,7 +33856,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -59610,7 +34715,7 @@
+@@ -60307,7 +59491,7 @@
}
}
@@ -73794,7 +33865,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -59620,19 +34725,19 @@
+@@ -60317,43 +59501,41 @@
stream.begin (),
1,
_tao_elem,
@@ -73818,7 +33889,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -59646,15 +34751,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ContextIdSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ContextIdSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -73837,7 +33920,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -59665,7 +34770,7 @@
+@@ -60364,7 +59546,7 @@
IR::_tc_ContextIdSeq,
1,
ACE_static_cast (void *, tmp),
@@ -73846,21 +33929,16 @@
);
_tao_elem = tmp;
return 1;
-@@ -59683,11 +34788,11 @@
+@@ -60382,7 +59564,7 @@
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)
-@@ -59697,17 +34802,17 @@
+@@ -60392,25 +59574,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -73880,9 +33958,21 @@
- _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
- {
-@@ -59724,29 +34829,29 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_OperationDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_OperationDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -60421,29 +59601,29 @@
IR::_tc_OperationDef,
1,
_tao_elem,
@@ -73918,7 +34008,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -59757,7 +34862,7 @@
+@@ -60454,7 +59634,7 @@
);
}
@@ -73927,7 +34017,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -59767,16 +34872,16 @@
+@@ -60464,40 +59644,38 @@
stream.begin (),
1,
_tao_elem,
@@ -73948,7 +34038,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -59790,15 +34895,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_OperationDescription, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_OperationDescription, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -73967,7 +34069,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -59809,7 +34914,7 @@
+@@ -60508,7 +59686,7 @@
IR::_tc_OperationDescription,
1,
ACE_static_cast (void *, tmp),
@@ -73976,7 +34078,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -59829,7 +34934,7 @@
+@@ -60528,7 +59706,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -73985,7 +34087,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -59843,7 +34948,7 @@
+@@ -60542,7 +59720,7 @@
}
}
@@ -73994,7 +34096,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -59853,19 +34958,19 @@
+@@ -60552,43 +59730,41 @@
stream.begin (),
1,
_tao_elem,
@@ -74018,7 +34120,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -59879,15 +34984,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_RepositoryIdSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_RepositoryIdSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -74037,7 +34151,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -59898,7 +35003,7 @@
+@@ -60599,7 +59775,7 @@
IR::_tc_RepositoryIdSeq,
1,
ACE_static_cast (void *, tmp),
@@ -74046,7 +34160,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -59918,7 +35023,7 @@
+@@ -60619,7 +59795,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -74055,7 +34169,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -59932,7 +35037,7 @@
+@@ -60633,7 +59809,7 @@
}
}
@@ -74064,7 +34178,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -59942,19 +35047,19 @@
+@@ -60643,43 +59819,41 @@
stream.begin (),
1,
_tao_elem,
@@ -74088,7 +34202,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -59968,15 +35073,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_OpDescriptionSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_OpDescriptionSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -74107,7 +34233,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -59987,7 +35092,7 @@
+@@ -60690,7 +59864,7 @@
IR::_tc_OpDescriptionSeq,
1,
ACE_static_cast (void *, tmp),
@@ -74116,7 +34242,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -60007,7 +35112,7 @@
+@@ -60710,7 +59884,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -74125,7 +34251,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -60021,7 +35126,7 @@
+@@ -60724,7 +59898,7 @@
}
}
@@ -74134,7 +34260,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -60031,19 +35136,19 @@
+@@ -60734,43 +59908,41 @@
stream.begin (),
1,
_tao_elem,
@@ -74158,7 +34284,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -60057,15 +35162,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_AttrDescriptionSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_AttrDescriptionSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -74177,7 +34315,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -60076,7 +35181,7 @@
+@@ -60781,7 +59953,7 @@
IR::_tc_AttrDescriptionSeq,
1,
ACE_static_cast (void *, tmp),
@@ -74186,21 +34324,16 @@
);
_tao_elem = tmp;
return 1;
-@@ -60094,11 +35199,11 @@
+@@ -60799,7 +59971,7 @@
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)
-@@ -60108,17 +35213,17 @@
+@@ -60809,25 +59981,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -74220,9 +34353,21 @@
- _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
- {
-@@ -60135,29 +35240,29 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_InterfaceDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_InterfaceDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -60838,29 +60008,29 @@
IR::_tc_InterfaceDef,
1,
_tao_elem,
@@ -74258,7 +34403,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -60168,7 +35273,7 @@
+@@ -60871,7 +60041,7 @@
);
}
@@ -74267,7 +34412,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -60178,16 +35283,16 @@
+@@ -60881,40 +60051,38 @@
stream.begin (),
1,
_tao_elem,
@@ -74288,7 +34433,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -60201,15 +35306,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_InterfaceDescription, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_InterfaceDescription, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -74307,7 +34464,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -60220,7 +35325,7 @@
+@@ -60925,7 +60093,7 @@
IR::_tc_InterfaceDescription,
1,
ACE_static_cast (void *, tmp),
@@ -74316,7 +34473,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -60238,7 +35343,7 @@
+@@ -60943,7 +60111,7 @@
return 0;
}
@@ -74325,7 +34482,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -60249,7 +35354,7 @@
+@@ -60954,7 +60122,7 @@
);
}
@@ -74334,7 +34491,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -60259,16 +35364,16 @@
+@@ -60964,40 +60132,38 @@
stream.begin (),
1,
_tao_elem,
@@ -74355,7 +34512,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -60282,15 +35387,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ValueMember, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ValueMember, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -74374,7 +34543,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -60301,7 +35406,7 @@
+@@ -61008,7 +60174,7 @@
IR::_tc_ValueMember,
1,
ACE_static_cast (void *, tmp),
@@ -74383,7 +34552,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -60321,7 +35426,7 @@
+@@ -61028,7 +60194,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -74392,7 +34561,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -60335,7 +35440,7 @@
+@@ -61042,7 +60208,7 @@
}
}
@@ -74401,7 +34570,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -60345,19 +35450,19 @@
+@@ -61052,43 +60218,41 @@
stream.begin (),
1,
_tao_elem,
@@ -74425,7 +34594,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -60371,15 +35476,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ValueMemberSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ValueMemberSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -74444,7 +34625,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -60390,7 +35495,7 @@
+@@ -61099,7 +60263,7 @@
IR::_tc_ValueMemberSeq,
1,
ACE_static_cast (void *, tmp),
@@ -74453,21 +34634,16 @@
);
_tao_elem = tmp;
return 1;
-@@ -60408,11 +35513,11 @@
+@@ -61117,7 +60281,7 @@
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)
-@@ -60422,17 +35527,17 @@
+@@ -61127,25 +60291,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -74487,9 +34663,21 @@
- _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
- {
-@@ -60449,33 +35554,33 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ValueMemberDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ValueMemberDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -61156,29 +60318,29 @@
IR::_tc_ValueMemberDef,
1,
_tao_elem,
@@ -74520,17 +34708,12 @@
+ # 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)
-@@ -60485,17 +35590,17 @@
+@@ -61188,25 +60350,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -74550,9 +34733,21 @@
- _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
- {
-@@ -60512,29 +35617,29 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ValueDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ValueDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -61217,29 +60377,29 @@
IR::_tc_ValueDef,
1,
_tao_elem,
@@ -74588,7 +34783,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -60545,7 +35650,7 @@
+@@ -61250,7 +60410,7 @@
);
}
@@ -74597,7 +34792,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -60555,16 +35660,16 @@
+@@ -61260,40 +60420,38 @@
stream.begin (),
1,
_tao_elem,
@@ -74618,7 +34813,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -60578,15 +35683,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ValueDescription, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ValueDescription, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -74637,7 +34844,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -60597,7 +35702,7 @@
+@@ -61304,7 +60462,7 @@
IR::_tc_ValueDescription,
1,
ACE_static_cast (void *, tmp),
@@ -74646,21 +34853,16 @@
);
_tao_elem = tmp;
return 1;
-@@ -60615,11 +35720,11 @@
+@@ -61322,7 +60480,7 @@
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)
-@@ -60629,17 +35734,17 @@
+@@ -61332,25 +60490,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -74680,9 +34882,21 @@
- _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
- {
-@@ -60656,33 +35761,33 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ValueBoxDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ValueBoxDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -61361,29 +60517,29 @@
IR::_tc_ValueBoxDef,
1,
_tao_elem,
@@ -74713,17 +34927,12 @@
+ # 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)
-@@ -60692,17 +35797,17 @@
+@@ -61393,25 +60549,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -74743,9 +34952,21 @@
- _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
- {
-@@ -60719,29 +35824,29 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ProvidesDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -61422,29 +60576,29 @@
IR::_tc_ProvidesDef,
1,
_tao_elem,
@@ -74781,7 +35002,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -60752,7 +35857,7 @@
+@@ -61455,7 +60609,7 @@
);
}
@@ -74790,7 +35011,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -60762,16 +35867,16 @@
+@@ -61465,40 +60619,38 @@
stream.begin (),
1,
_tao_elem,
@@ -74811,7 +35032,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -60785,15 +35890,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDescription, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ProvidesDescription, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -74830,7 +35063,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -60804,7 +35909,7 @@
+@@ -61509,7 +60661,7 @@
IR::_tc_ProvidesDescription,
1,
ACE_static_cast (void *, tmp),
@@ -74839,21 +35072,16 @@
);
_tao_elem = tmp;
return 1;
-@@ -60822,11 +35927,11 @@
+@@ -61527,7 +60679,7 @@
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)
-@@ -60836,17 +35941,17 @@
+@@ -61537,25 +60689,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -74873,9 +35101,21 @@
- _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
- {
-@@ -60863,29 +35968,29 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_UsesDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_UsesDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -61566,29 +60716,29 @@
IR::_tc_UsesDef,
1,
_tao_elem,
@@ -74911,7 +35151,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -60896,7 +36001,7 @@
+@@ -61599,7 +60749,7 @@
);
}
@@ -74920,7 +35160,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -60906,16 +36011,16 @@
+@@ -61609,40 +60759,38 @@
stream.begin (),
1,
_tao_elem,
@@ -74941,7 +35181,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -60929,15 +36034,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_UsesDescription, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_UsesDescription, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -74960,7 +35212,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -60948,7 +36053,7 @@
+@@ -61653,7 +60801,7 @@
IR::_tc_UsesDescription,
1,
ACE_static_cast (void *, tmp),
@@ -74969,7 +35221,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -60968,7 +36073,7 @@
+@@ -61673,7 +60821,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -74978,7 +35230,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -60982,7 +36087,7 @@
+@@ -61687,7 +60835,7 @@
}
}
@@ -74987,7 +35239,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -60992,19 +36097,19 @@
+@@ -61697,43 +60845,41 @@
stream.begin (),
1,
_tao_elem,
@@ -75011,7 +35263,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -61018,15 +36123,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDescSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ProvidesDescSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -75030,7 +35294,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -61037,7 +36142,7 @@
+@@ -61744,7 +60890,7 @@
IR::_tc_ProvidesDescSeq,
1,
ACE_static_cast (void *, tmp),
@@ -75039,7 +35303,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -61057,7 +36162,7 @@
+@@ -61764,7 +60910,7 @@
void operator<<= (
CORBA::Any &_tao_any,
@@ -75048,7 +35312,7 @@
) // copying
{
TAO_OutputCDR stream;
-@@ -61071,7 +36176,7 @@
+@@ -61778,7 +60924,7 @@
}
}
@@ -75057,7 +35321,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -61081,19 +36186,19 @@
+@@ -61788,43 +60934,41 @@
stream.begin (),
1,
_tao_elem,
@@ -75081,7 +35345,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -61107,15 +36212,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_UsesDescSeq, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_UsesDescSeq, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -75100,7 +35376,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -61126,7 +36231,7 @@
+@@ -61835,7 +60979,7 @@
IR::_tc_UsesDescSeq,
1,
ACE_static_cast (void *, tmp),
@@ -75109,21 +35385,16 @@
);
_tao_elem = tmp;
return 1;
-@@ -61144,11 +36249,11 @@
+@@ -61853,7 +60997,7 @@
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)
-@@ -61158,17 +36263,17 @@
+@@ -61863,25 +61007,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -75143,9 +35414,21 @@
- _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
- {
-@@ -61185,29 +36290,29 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_EventDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_EventDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -61892,29 +61034,29 @@
IR::_tc_EventDef,
1,
_tao_elem,
@@ -75181,7 +35464,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -61218,7 +36323,7 @@
+@@ -61925,7 +61067,7 @@
);
}
@@ -75190,7 +35473,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -61228,16 +36333,16 @@
+@@ -61935,40 +61077,38 @@
stream.begin (),
1,
_tao_elem,
@@ -75211,7 +35494,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -61251,15 +36356,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_EventDescription, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_EventDescription, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -75230,7 +35525,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -61270,7 +36375,7 @@
+@@ -61979,7 +61119,7 @@
IR::_tc_EventDescription,
1,
ACE_static_cast (void *, tmp),
@@ -75239,21 +35534,16 @@
);
_tao_elem = tmp;
return 1;
-@@ -61288,11 +36393,11 @@
+@@ -61997,7 +61137,7 @@
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)
-@@ -61302,17 +36407,17 @@
+@@ -62007,25 +61147,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -75273,9 +35563,21 @@
- _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
- {
-@@ -61329,33 +36434,33 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_EmitsDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_EmitsDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -62036,29 +61174,29 @@
IR::_tc_EmitsDef,
1,
_tao_elem,
@@ -75306,17 +35608,12 @@
+ # 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)
-@@ -61365,17 +36470,17 @@
+@@ -62068,25 +61206,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -75336,9 +35633,21 @@
- _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
- {
-@@ -61392,33 +36497,33 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_PublishesDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_PublishesDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -62097,29 +61233,29 @@
IR::_tc_PublishesDef,
1,
_tao_elem,
@@ -75369,17 +35678,12 @@
+ # 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)
-@@ -61428,17 +36533,17 @@
+@@ -62129,25 +61265,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -75399,9 +35703,21 @@
- _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
- {
-@@ -61455,33 +36560,33 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ConsumesDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ConsumesDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -62158,29 +61292,29 @@
IR::_tc_ConsumesDef,
1,
_tao_elem,
@@ -75432,17 +35748,12 @@
+ # 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)
-@@ -61491,17 +36596,17 @@
+@@ -62190,25 +61324,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -75462,9 +35773,21 @@
- _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
- {
-@@ -61518,29 +36623,29 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ComponentDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -62219,29 +61351,29 @@
IR::_tc_ComponentDef,
1,
_tao_elem,
@@ -75500,7 +35823,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -61551,7 +36656,7 @@
+@@ -62252,7 +61384,7 @@
);
}
@@ -75509,7 +35832,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -61561,16 +36666,16 @@
+@@ -62262,40 +61394,38 @@
stream.begin (),
1,
_tao_elem,
@@ -75530,7 +35853,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -61584,15 +36689,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDescription, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_ComponentDescription, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -75549,7 +35884,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -61603,7 +36708,7 @@
+@@ -62306,7 +61436,7 @@
IR::_tc_ComponentDescription,
1,
ACE_static_cast (void *, tmp),
@@ -75558,21 +35893,16 @@
);
_tao_elem = tmp;
return 1;
-@@ -61621,11 +36726,11 @@
+@@ -62324,7 +61454,7 @@
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)
-@@ -61635,17 +36740,17 @@
+@@ -62334,25 +61464,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -75592,9 +35922,21 @@
- _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
- {
-@@ -61662,29 +36767,29 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_PrimaryKeyDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_PrimaryKeyDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -62363,29 +61491,29 @@
IR::_tc_PrimaryKeyDef,
1,
_tao_elem,
@@ -75630,7 +35972,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -61695,7 +36800,7 @@
+@@ -62396,7 +61524,7 @@
);
}
@@ -75639,7 +35981,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -61705,16 +36810,16 @@
+@@ -62406,40 +61534,38 @@
stream.begin (),
1,
_tao_elem,
@@ -75660,7 +36002,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -61728,15 +36833,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_PrimaryKeyDescription, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_PrimaryKeyDescription, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -75679,7 +36033,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -61747,7 +36852,7 @@
+@@ -62450,7 +61576,7 @@
IR::_tc_PrimaryKeyDescription,
1,
ACE_static_cast (void *, tmp),
@@ -75688,21 +36042,16 @@
);
_tao_elem = tmp;
return 1;
-@@ -61765,11 +36870,11 @@
+@@ -62468,7 +61594,7 @@
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)
-@@ -61779,17 +36884,17 @@
+@@ -62478,25 +61604,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -75722,9 +36071,21 @@
- _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
- {
-@@ -61806,33 +36911,33 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_FactoryDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_FactoryDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -62507,29 +61631,29 @@
IR::_tc_FactoryDef,
1,
_tao_elem,
@@ -75755,17 +36116,12 @@
+ # 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)
-@@ -61842,17 +36947,17 @@
+@@ -62539,25 +61663,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -75785,9 +36141,21 @@
- _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
- {
-@@ -61869,33 +36974,33 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_FinderDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_FinderDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -62568,29 +61690,29 @@
IR::_tc_FinderDef,
1,
_tao_elem,
@@ -75818,17 +36186,12 @@
+ # 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)
-@@ -61905,17 +37010,17 @@
+@@ -62600,25 +61722,23 @@
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -75848,9 +36211,21 @@
- _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
- {
-@@ -61932,29 +37037,29 @@
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_HomeDef, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_HomeDef, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -62629,29 +61749,29 @@
IR::_tc_HomeDef,
1,
_tao_elem,
@@ -75886,7 +36261,7 @@
{
TAO_OutputCDR stream;
stream << _tao_elem;
-@@ -61965,7 +37070,7 @@
+@@ -62662,7 +61782,7 @@
);
}
@@ -75895,7 +36270,7 @@
{
TAO_OutputCDR stream;
stream << *_tao_elem;
-@@ -61975,16 +37080,16 @@
+@@ -62672,40 +61792,38 @@
stream.begin (),
1,
_tao_elem,
@@ -75916,7 +36291,19 @@
{
_tao_elem = 0;
ACE_TRY_NEW_ENV
-@@ -61998,15 +37103,15 @@
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+-
+- CORBA::Boolean result = type->equivalent (IR::_tc_HomeDescription, ACE_TRY_ENV);
++ if (!type->equivalent (IR::_tc_HomeDescription, ACE_TRY_ENV)) // not equal
++ {
++ return 0;
++ }
+ ACE_TRY_CHECK;
+-
+- if (!result)
+- return 0; // not equivalent
+-
if (_tao_any.any_owns_data ())
{
_tao_elem = ACE_static_cast(
@@ -75935,7 +36322,7 @@
TAO_InputCDR stream (
_tao_any._tao_get_cdr (),
_tao_any._tao_byte_order ()
-@@ -62017,7 +37122,7 @@
+@@ -62716,7 +61834,7 @@
IR::_tc_HomeDescription,
1,
ACE_static_cast (void *, tmp),
@@ -75944,7 +36331,7 @@
);
_tao_elem = tmp;
return 1;
-@@ -62037,7 +37142,7 @@
+@@ -62736,7 +61854,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -75953,7 +36340,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62055,7 +37160,7 @@
+@@ -62754,7 +61872,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -75962,7 +36349,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62079,7 +37184,7 @@
+@@ -62778,7 +61896,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -75971,7 +36358,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62097,7 +37202,7 @@
+@@ -62796,7 +61914,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -75980,7 +36367,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62121,7 +37226,7 @@
+@@ -62820,7 +61938,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -75989,7 +36376,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62139,7 +37244,7 @@
+@@ -62838,7 +61956,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -75998,7 +36385,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62163,7 +37268,7 @@
+@@ -62862,7 +61980,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76007,7 +36394,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62181,7 +37286,7 @@
+@@ -62880,7 +61998,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76016,7 +36403,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62205,7 +37310,7 @@
+@@ -62904,7 +62022,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76025,7 +36412,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62223,7 +37328,7 @@
+@@ -62922,7 +62040,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76034,7 +36421,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62247,7 +37352,7 @@
+@@ -62946,7 +62064,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76043,7 +36430,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62265,7 +37370,7 @@
+@@ -62964,7 +62082,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76052,7 +36439,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62289,7 +37394,7 @@
+@@ -62988,7 +62106,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76061,7 +36448,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62307,7 +37412,7 @@
+@@ -63006,7 +62124,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76070,7 +36457,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62331,7 +37436,7 @@
+@@ -63030,7 +62148,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76079,7 +36466,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62349,7 +37454,7 @@
+@@ -63048,7 +62166,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76088,7 +36475,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62373,7 +37478,7 @@
+@@ -63072,7 +62190,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76097,7 +36484,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62391,7 +37496,7 @@
+@@ -63090,7 +62208,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76106,7 +36493,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62415,7 +37520,7 @@
+@@ -63114,7 +62232,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76115,7 +36502,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62433,7 +37538,7 @@
+@@ -63132,7 +62250,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76124,7 +36511,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62457,7 +37562,7 @@
+@@ -63156,7 +62274,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76133,7 +36520,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62475,7 +37580,7 @@
+@@ -63174,7 +62292,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76142,7 +36529,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62499,7 +37604,7 @@
+@@ -63198,7 +62316,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76151,7 +36538,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62517,7 +37622,7 @@
+@@ -63216,7 +62334,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76160,7 +36547,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62541,7 +37646,7 @@
+@@ -63240,7 +62358,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76169,7 +36556,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62559,7 +37664,7 @@
+@@ -63258,7 +62376,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76178,7 +36565,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62583,7 +37688,7 @@
+@@ -63282,7 +62400,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76187,7 +36574,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62601,7 +37706,7 @@
+@@ -63300,7 +62418,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76196,7 +36583,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62625,7 +37730,7 @@
+@@ -63324,7 +62442,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76205,7 +36592,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62643,7 +37748,7 @@
+@@ -63342,7 +62460,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76214,7 +36601,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62667,7 +37772,7 @@
+@@ -63366,7 +62484,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76223,7 +36610,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62685,7 +37790,7 @@
+@@ -63384,7 +62502,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76232,7 +36619,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62709,7 +37814,7 @@
+@@ -63408,7 +62526,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76241,7 +36628,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62727,7 +37832,7 @@
+@@ -63426,7 +62544,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76250,7 +36637,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62751,7 +37856,7 @@
+@@ -63450,7 +62568,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76259,7 +36646,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62769,7 +37874,7 @@
+@@ -63468,7 +62586,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76268,7 +36655,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62793,7 +37898,7 @@
+@@ -63492,7 +62610,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76277,7 +36664,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62811,7 +37916,7 @@
+@@ -63510,7 +62628,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76286,7 +36673,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62835,7 +37940,7 @@
+@@ -63534,7 +62652,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76295,7 +36682,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62853,7 +37958,7 @@
+@@ -63552,7 +62670,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76304,7 +36691,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62877,7 +37982,7 @@
+@@ -63576,7 +62694,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76313,7 +36700,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62895,7 +38000,7 @@
+@@ -63594,7 +62712,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76322,7 +36709,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62919,7 +38024,7 @@
+@@ -63618,7 +62736,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76331,7 +36718,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62937,7 +38042,7 @@
+@@ -63636,7 +62754,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76340,7 +36727,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -62961,7 +38066,7 @@
+@@ -63660,7 +62778,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76349,7 +36736,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -62979,7 +38084,7 @@
+@@ -63678,7 +62796,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76358,7 +36745,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -63003,7 +38108,7 @@
+@@ -63702,7 +62820,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76367,7 +36754,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -63021,7 +38126,7 @@
+@@ -63720,7 +62838,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76376,7 +36763,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -63045,7 +38150,7 @@
+@@ -63744,7 +62862,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76385,7 +36772,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -63063,7 +38168,7 @@
+@@ -63762,7 +62880,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76394,7 +36781,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -63087,7 +38192,7 @@
+@@ -63786,7 +62904,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76403,7 +36790,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -63105,7 +38210,7 @@
+@@ -63804,7 +62922,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
@@ -76412,7 +36799,7 @@
)
{
CORBA::ULong _tao_seq_len;
-@@ -63129,7 +38234,7 @@
+@@ -63828,7 +62946,7 @@
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
@@ -76421,7 +36808,7 @@
)
{
if (strm << _tao_sequence.length ())
-@@ -63147,7 +38252,7 @@
+@@ -63846,7 +62964,7 @@
CORBA::Boolean operator>> (
TAO_InputCDR &strm,
diff --git a/TAO/tao/IFR_Client/diffs/InterfaceC.h.diff b/TAO/tao/IFR_Client/diffs/InterfaceC.h.diff
index 08ce814f5fe..40b7f3da9de 100644
--- a/TAO/tao/IFR_Client/diffs/InterfaceC.h.diff
+++ b/TAO/tao/IFR_Client/diffs/InterfaceC.h.diff
@@ -1,5 +1,5 @@
---- InterfaceC.h Fri Jan 12 21:21:44 2001
-+++ ..\InterfaceC.h Fri Jan 12 21:30:36 2001
+--- orig/InterfaceC.h Fri Mar 09 00:47:29 2001
++++ InterfaceC.h Thu Mar 01 15:33:59 2001
@@ -1,6 +1,6 @@
// -*- C++ -*-
//
@@ -8,12 +8,12 @@
// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
// TAO and the TAO IDL Compiler have been developed by:
-@@ -19,21 +19,24 @@
+@@ -19,22 +19,27 @@
// 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_ORIG_INTERFACEC_H_
+-#define _TAO_IDL_ORIG_INTERFACEC_H_
-
+#ifndef TAO_IDL_INTERFACEC_H
+#define TAO_IDL_INTERFACEC_H
@@ -26,13 +26,8 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
--
--#if defined (TAO_EXPORT_MACRO)
--#undef TAO_EXPORT_MACRO
--#endif
--#define TAO_EXPORT_MACRO TAO_IFR_Client_Export
+-#include "ifr_client_export.h"
+#include "tao/TAO_Singleton.h"
-+#include "tao/corbafwd.h"
+#include "tao/Any.h"
+#include "tao/Object.h"
+#include "tao/Managed_Types.h"
@@ -40,9 +35,17 @@
+#include "tao/Typecode.h"
+#include "tao/Remote_Object_Proxy_Impl.h"
+-#if defined (TAO_EXPORT_MACRO)
+-#undef TAO_EXPORT_MACRO
+-#endif
+-#define TAO_EXPORT_MACRO TAO_IFR_Client_Export
++#if (TAO_HAS_INTERCEPTORS == 1)
++ #include "tao/ClientRequestInfo.h"
++#endif /* TAO_HAS_INTERCEPTORS == 1 */
+
#if defined (TAO_EXPORT_NESTED_CLASSES)
# if defined (TAO_EXPORT_NESTED_MACRO)
-@@ -53,176 +56,85 @@
+@@ -54,175 +59,84 @@
#pragma option push -w-rvl -w-rch -w-ccc -w-inl
#endif /* __BORLANDC__ */
@@ -130,31 +133,28 @@
- IRObject_var (IRObject_ptr p) : ptr_ (p) {}
- IRObject_var (const IRObject_var &); // copy constructor
- ~IRObject_var (void); // destructor
--
++ 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
+
- IRObject_var &operator= (IRObject_ptr);
- IRObject_var &operator= (const IRObject_var &);
- IRObject_ptr operator-> (void) const;
--
++ 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 &();
-- // in, inout, out, _retn
++ 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_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 CORBA_IRObject_ptr &() const;
-+ operator CORBA_IRObject_ptr &();
-+ // in, inout, out, _retn
+ CORBA_IRObject_ptr in (void) const;
+ CORBA_IRObject_ptr &inout (void);
+ CORBA_IRObject_ptr &out (void);
@@ -191,7 +191,6 @@
- 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 &);
@@ -201,7 +200,7 @@
+ operator CORBA_IRObject_ptr &();
+ CORBA_IRObject_ptr &ptr (void);
+ CORBA_IRObject_ptr operator-> (void);
-+
+
private:
- IRObject_ptr &ptr_;
+ CORBA_IRObject_ptr &ptr_;
@@ -219,9 +218,8 @@
class _TAO_IRObject_Remote_Proxy_Impl;
class _TAO_IRObject_Proxy_Broker;
class _TAO_IRObject_Remote_Proxy_Broker;
--
+
- class TAO_IFR_Client_Export IRObject : public virtual CORBA_Object
-+
+ class TAO_IFR_Client_Export CORBA_IRObject : public virtual CORBA_Object
{
public:
@@ -238,15 +236,13 @@
+ static CORBA_IRObject_ptr _duplicate (CORBA_IRObject_ptr obj);
+ static CORBA_IRObject_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static IRObject_ptr _nil (void)
@@ -259,184 +255,87 @@
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 =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -230,138 +142,48 @@
- ));
-
- 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 &ACE_TRY_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:
+@@ -251,14 +165,14 @@
_TAO_IRObject_Proxy_Broker *the_TAO_IRObject_Proxy_Broker_;
--
-+
-+ protected:
-+ CORBA_IRObject (int collocated = 0);
-+
+
protected:
- 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 (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 CORBA_IRObject_setup_collocation (int collocated);
+
- IRObject (
-- TAO_Stub *objref,
-+ // 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,
+ 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;
--
+@@ -268,10 +182,10 @@
+ friend class _TAO_IRObject_ThruPOA_Proxy_Impl;
+ friend class _TAO_IRObject_Direct_Proxy_Impl;
+
- virtual ~IRObject (void);
-- private:
++ virtual ~CORBA_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:
++ CORBA_IRObject (const CORBA_IRObject &);
++ void operator= (const CORBA_IRObject &);
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -281,7 +195,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class CORBA_IRObject;
+
+ friend class _TAO_IRObject_Remote_Proxy_Impl;
+ friend class _TAO_IRObject_ThruPOA_Proxy_Impl;
+@@ -315,15 +229,15 @@
+ 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
++ void result (IR_DefinitionKind result);
+ // update the result
- IR::DefinitionKind _result;
-- };
--
-- class TAO_ClientRequestInfo_CORBA_IRObject_destroy : public TAO_ClientRequestInfo
-- {
-- public:
++ IR_DefinitionKind _result;
+ };
+
+ class TAO_ClientRequestInfo_CORBA_IRObject_destroy : public TAO_ClientRequestInfo
+ {
+ public:
- friend class CORBA::IRObject;
--
-+
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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_destroy (const TAO_ClientRequestInfo_CORBA_IRObject_destroy &);
-- void operator= (const TAO_ClientRequestInfo_CORBA_IRObject_destroy &);
--
--};
--
--#endif /* TAO_HAS_INTERCEPTORS */
-
--};
-+ virtual ~CORBA_IRObject (void);
-+ private:
-+ CORBA_IRObject (const CORBA_IRObject &);
-+ void operator= (const CORBA_IRObject &);
-+ };
+@@ -364,7 +278,6 @@
+ };
+-
// The Proxy Implementations are used by each interface to
-@@ -377,8 +199,8 @@
- {
+ // perform a call. Each different implementation encapsulate
+ // an invocation logics.
+@@ -379,7 +292,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
)
-@@ -398,6 +220,7 @@
+@@ -399,6 +312,7 @@
_TAO_IRObject_Proxy_Impl (void);
};
@@ -444,45 +343,16 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -407,16 +230,16 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_IRObject_Remote_Proxy_Impl :
-+class TAO_IFR_Client_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);
--
-+
+@@ -417,7 +331,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
)
-@@ -440,49 +263,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_IRObject_Proxy_Broker
+@@ -455,8 +369,9 @@
{
public:
virtual ~_TAO_IRObject_Proxy_Broker (void);
@@ -493,48 +363,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_IRObject_Proxy_Broker (void);
--
-+
+@@ -465,6 +380,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_IRObject_Remote_Proxy_Broker : public virtual _TAO_IRObject_Proxy_Broker
- {
--public:
-+public:
- _TAO_IRObject_Remote_Proxy_Broker (void);
--
-+
+@@ -482,7 +398,7 @@
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 ()
);
-@@ -496,373 +320,180 @@
+@@ -496,367 +412,174 @@
static _TAO_IRObject_Remote_Proxy_Broker *the_TAO_IRObject_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -602,9 +454,8 @@
-#define _IR_CONTAINED___VAR_CH_
-
- class TAO_IFR_Client_Export Contained_var : public TAO_Base_var
-+ class TAO_IFR_Client_Export IR_Contained_var : public TAO_Base_var
- {
- public:
+- {
+- public:
- Contained_var (void); // default constructor
- Contained_var (Contained_ptr p) : ptr_ (p) {}
- Contained_var (const Contained_var &); // copy constructor
@@ -622,28 +473,10 @@
- Contained_ptr &out (void);
- Contained_ptr _retn (void);
- Contained_ptr ptr (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 IR_Contained_ptr &() const;
-+ operator IR_Contained_ptr &();
-+ // in, inout, out, _retn
-+ 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:
+-
+- private:
- Contained_ptr ptr_;
-+ IR_Contained_ptr ptr_;
- // Unimplemented - prevents widening assignment.
+- // Unimplemented - prevents widening assignment.
- Contained_var (const TAO_Base_var &rhs);
- Contained_var &operator= (const TAO_Base_var &rhs);
- };
@@ -670,10 +503,8 @@
-
- private:
- Contained_ptr &ptr_;
-+ IR_Contained_var (const TAO_Base_var &rhs);
-+ IR_Contained_var &operator= (const TAO_Base_var &rhs);
- };
-
+- };
+-
-
-#endif /* end #if !defined */
-
@@ -691,53 +522,62 @@
-#define _IR_REPOSITORY___VAR_CH_
-
- class TAO_IFR_Client_Export Repository_var : public TAO_Base_var
-+ class TAO_IFR_Client_Export IR_Contained_out
++ class TAO_IFR_Client_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
--
++ 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
+
- Repository_var &operator= (Repository_ptr);
- Repository_var &operator= (const Repository_var &);
- Repository_ptr operator-> (void) const;
--
++ 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 &();
-- // in, inout, out, _retn
++ 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;
--
-- private:
++ 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_;
-- // Unimplemented - prevents widening assignment.
++ 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 */
-+ 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);
-
+-
-
-#if !defined (_IR_REPOSITORY___OUT_CH_)
-#define _IR_REPOSITORY___OUT_CH_
-
- class TAO_IFR_Client_Export Repository_out
-- {
-- public:
++ class TAO_IFR_Client_Export IR_Contained_out
+ {
+ public:
- Repository_out (Repository_ptr &);
- Repository_out (Repository_var &);
- Repository_out (const Repository_out &);
@@ -747,7 +587,16 @@
- 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_;
@@ -777,31 +626,28 @@
- Container_var (Container_ptr p) : ptr_ (p) {}
- Container_var (const Container_var &); // copy constructor
- ~Container_var (void); // destructor
--
++ 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
+
- Container_var &operator= (Container_ptr);
- Container_var &operator= (const Container_var &);
- Container_ptr operator-> (void) const;
--
++ 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 &();
-- // in, inout, out, _retn
++ 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_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 IR_Repository_ptr &() const;
-+ operator IR_Repository_ptr &();
-+ // in, inout, out, _retn
+ IR_Repository_ptr in (void) const;
+ IR_Repository_ptr &inout (void);
+ IR_Repository_ptr &out (void);
@@ -838,7 +684,6 @@
- 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 &);
@@ -848,7 +693,7 @@
+ operator IR_Repository_ptr &();
+ IR_Repository_ptr &ptr (void);
+ IR_Repository_ptr operator-> (void);
-+
+
private:
- Container_ptr &ptr_;
+ IR_Repository_ptr &ptr_;
@@ -878,31 +723,28 @@
- Contained_var (Contained_ptr p) : ptr_ (p) {}
- Contained_var (const Contained_var &); // copy constructor
- ~Contained_var (void); // destructor
--
++ 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
+
- Contained_var &operator= (Contained_ptr);
- Contained_var &operator= (const Contained_var &);
- Contained_ptr operator-> (void) const;
--
++ 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 &();
-- // in, inout, out, _retn
++ 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_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 IR_Container_ptr &() const;
-+ operator IR_Container_ptr &();
-+ // in, inout, out, _retn
+ IR_Container_ptr in (void) const;
+ IR_Container_ptr &inout (void);
+ IR_Container_ptr &out (void);
@@ -939,7 +781,6 @@
- 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 &);
@@ -949,7 +790,7 @@
+ operator IR_Container_ptr &();
+ IR_Container_ptr &ptr (void);
+ IR_Container_ptr operator-> (void);
-+
+
private:
- Contained_ptr &ptr_;
+ IR_Container_ptr &ptr_;
@@ -967,9 +808,8 @@
class _TAO_Contained_Remote_Proxy_Impl;
class _TAO_Contained_Proxy_Broker;
class _TAO_Contained_Remote_Proxy_Broker;
--
+
- class TAO_IFR_Client_Export Contained: public virtual CORBA::IRObject
-+
+ class TAO_IFR_Client_Export IR_Contained: public virtual CORBA_IRObject
{
public:
@@ -986,15 +826,13 @@
+ static IR_Contained_ptr _duplicate (IR_Contained_ptr obj);
+ static IR_Contained_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static Contained_ptr _nil (void)
@@ -1005,97 +843,25 @@
}
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 ((
-@@ -871,7 +502,7 @@
-
- virtual void id (
- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -879,7 +510,7 @@
- ));
-
- virtual char * name (
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -888,7 +519,7 @@
-
- virtual void name (
- const char * name,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -896,7 +527,7 @@
- ));
-
- virtual char * version (
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -905,15 +536,15 @@
-
- virtual void version (
- const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
+@@ -912,7 +635,7 @@
CORBA::SystemException
));
- virtual IR::Container_ptr defined_in (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_Container_ptr defined_in (
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -921,15 +552,15 @@
- ));
-
- virtual char * absolute_name (
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -928,7 +651,7 @@
CORBA::SystemException
));
- virtual IR::Repository_ptr containing_repository (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_Repository_ptr containing_repository (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -938,7 +569,7 @@
-
- struct Description;
- class Description_var;
--
-+
- struct TAO_IFR_Client_Export Description
- {
-
-@@ -948,7 +579,7 @@
+@@ -948,7 +671,7 @@
static void _tao_any_destructor (void*);
@@ -1104,50 +870,16 @@
CORBA::Any value;
};
-@@ -959,18 +590,18 @@
- 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);
-@@ -992,7 +623,7 @@
- operator Description *&();
- Description *&ptr (void);
- Description *operator-> (void);
--
-+
- private:
- Description *&ptr_;
- // assignment from T_var not allowed
-@@ -1001,8 +632,8 @@
+@@ -1001,7 +724,7 @@
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 =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -1010,10 +641,10 @@
+@@ -1010,7 +733,7 @@
));
virtual void move (
@@ -1155,650 +887,195 @@
+ 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 ((
-@@ -1021,572 +652,99 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -1033,14 +756,14 @@
_TAO_Contained_Proxy_Broker *the_TAO_Contained_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- Contained (
-- TAO_Stub *objref,
+ 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 IR_Contained_setup_collocation (int collocated);
+
+- Contained (
+ IR_Contained (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -1050,10 +773,10 @@
+ friend class _TAO_Contained_ThruPOA_Proxy_Impl;
+ friend class _TAO_Contained_Direct_Proxy_Impl;
+
- virtual ~Contained (void);
-- private:
++ virtual ~IR_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:
++ IR_Contained (const IR_Contained &);
++ void operator= (const IR_Contained &);
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -1063,7 +786,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
+@@ -1105,7 +828,7 @@
+ class TAO_ClientRequestInfo_IR_Contained_id_set : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::Contained;
--
-+
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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:
+@@ -1147,7 +870,7 @@
+ 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;
-+ virtual ~IR_Contained (void);
-+ private:
-+ IR_Contained (const IR_Contained &);
-+ void operator= (const IR_Contained &);
-
--TAO_ClientRequestInfo_IR_Contained_name_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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));
-+// 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_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;
--};
-+///////////////////////////////////////////////////////////////////////
-+// Base Impl. Declaration
-+//
-
--class TAO_ClientRequestInfo_IR_Contained_name_set : public TAO_ClientRequestInfo
-+class TAO_IFR_Client_Export _TAO_Contained_Proxy_Impl :
-+ public virtual _TAO_IRObject_Proxy_Impl
++ friend class IR_Contained;
+
+ friend class _TAO_Contained_Remote_Proxy_Impl;
+ friend class _TAO_Contained_ThruPOA_Proxy_Impl;
+@@ -1189,7 +912,7 @@
+ 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;
--
--TAO_ClientRequestInfo_IR_Contained_name_set (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 ~_TAO_Contained_Proxy_Impl (void) { }
-
--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_name_set (const TAO_ClientRequestInfo_IR_Contained_name_set &);
-- void operator= (const TAO_ClientRequestInfo_IR_Contained_name_set &);
-- const char * name_;
--
--};
-+ virtual char * name (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--class TAO_ClientRequestInfo_IR_Contained_version_get : public TAO_ClientRequestInfo
--{
--public:
++ friend class IR_Contained;
+
+ friend class _TAO_Contained_Remote_Proxy_Impl;
+ friend class _TAO_Contained_ThruPOA_Proxy_Impl;
+@@ -1231,7 +954,7 @@
+ class TAO_ClientRequestInfo_IR_Contained_version_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;
-+ virtual void name (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * name,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--TAO_ClientRequestInfo_IR_Contained_version_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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_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;
+@@ -1273,7 +996,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
+@@ -1315,7 +1038,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_Contained;
+
+ friend class _TAO_Contained_Remote_Proxy_Impl;
+ friend class _TAO_Contained_ThruPOA_Proxy_Impl;
+@@ -1349,15 +1072,15 @@
+ 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
++ 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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
+@@ -1399,7 +1122,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_Contained;
+
+ friend class _TAO_Contained_Remote_Proxy_Impl;
+ friend class _TAO_Contained_ThruPOA_Proxy_Impl;
+@@ -1433,15 +1156,15 @@
+ 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
++ void result (IR_Repository_ptr result);
+ // update the result
- IR::Repository_ptr _result;
--};
--
--class TAO_ClientRequestInfo_IR_Contained_describe : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_Contained;
+
+ friend class _TAO_Contained_Remote_Proxy_Impl;
+ friend class _TAO_Contained_ThruPOA_Proxy_Impl;
+@@ -1475,15 +1198,15 @@
+ 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
++ 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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_Contained;
+
+ friend class _TAO_Contained_Remote_Proxy_Impl;
+ friend class _TAO_Contained_ThruPOA_Proxy_Impl;
+@@ -1492,7 +1215,7 @@
+ TAO_ClientRequestInfo_IR_Contained_move (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -1520,7 +1243,7 @@
+ 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_IFR_Client_Export _TAO_Contained_Proxy_Impl :
++ IR_Container_ptr new_container_;
+ const char * new_name_;
+ const char * new_version_;
+
+@@ -1541,7 +1264,7 @@
+ //
+
+ class TAO_IFR_Client_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 void name (
-- CORBA_Object *_collocated_tao_target_,
-- const char * name,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
-- virtual char * version (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ 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_,
-@@ -1597,7 +755,7 @@
++ public virtual _TAO_IRObject_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_Contained_Proxy_Impl (void) { }
+@@ -1597,7 +1320,7 @@
CORBA::SystemException
)) = 0;
@@ -1807,7 +1084,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -1613,7 +771,7 @@
+@@ -1613,7 +1336,7 @@
CORBA::SystemException
)) = 0;
@@ -1816,7 +1093,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -1621,7 +779,7 @@
+@@ -1621,7 +1344,7 @@
CORBA::SystemException
)) = 0;
@@ -1825,7 +1102,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -1631,7 +789,7 @@
+@@ -1631,7 +1354,7 @@
virtual void move (
CORBA_Object *_collocated_tao_target_,
@@ -1834,7 +1111,7 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -1642,8 +800,8 @@
+@@ -1642,8 +1365,8 @@
protected:
_TAO_Contained_Proxy_Impl (void);
@@ -1844,32 +1121,16 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -1653,18 +811,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_Contained_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_Contained_Remote_Proxy_Impl :
+@@ -1656,7 +1379,7 @@
+ class TAO_IFR_Client_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:
- _TAO_Contained_Remote_Proxy_Impl (void);
--
-+
- virtual ~_TAO_Contained_Remote_Proxy_Impl (void) { }
--
-- virtual char * id (
-+
-+ virtual char * id (
- CORBA_Object *_collocated_tao_target_,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -1715,7 +873,7 @@
+@@ -1715,7 +1438,7 @@
CORBA::SystemException
));
@@ -1878,7 +1139,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -1731,7 +889,7 @@
+@@ -1731,7 +1454,7 @@
CORBA::SystemException
));
@@ -1887,7 +1148,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -1739,7 +897,7 @@
+@@ -1739,7 +1462,7 @@
CORBA::SystemException
));
@@ -1896,7 +1157,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -1749,7 +907,7 @@
+@@ -1749,7 +1472,7 @@
virtual void move (
CORBA_Object *_collocated_tao_target_,
@@ -1905,7 +1166,7 @@
const char * new_name,
const char * new_version,
CORBA::Environment &ACE_TRY_ENV
-@@ -1757,7 +915,6 @@
+@@ -1757,7 +1480,6 @@
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -1913,24 +1174,7 @@
};
//
-@@ -1766,49 +923,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_Contained_Proxy_Broker
+@@ -1780,8 +1502,9 @@
{
public:
virtual ~_TAO_Contained_Proxy_Broker (void);
@@ -1941,48 +1185,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_Contained_Proxy_Broker (void);
--
-+
+@@ -1790,6 +1513,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_Contained_Remote_Proxy_Broker : public virtual _TAO_Contained_Proxy_Broker
- {
--public:
-+public:
- _TAO_Contained_Remote_Proxy_Broker (void);
--
-+
+@@ -1807,7 +1531,7 @@
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 ()
);
-@@ -1822,3847 +980,2867 @@
+@@ -1821,702 +1545,462 @@
static _TAO_Contained_Remote_Proxy_Broker *the_TAO_Contained_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -2011,31 +1237,28 @@
- 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 &();
-- // in, inout, out, _retn
++ 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_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
-+
-+ 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
+ IR_ModuleDef_ptr in (void) const;
+ IR_ModuleDef_ptr &inout (void);
+ IR_ModuleDef_ptr &out (void);
@@ -2072,7 +1295,6 @@
- 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 &);
@@ -2082,7 +1304,7 @@
+ operator IR_ModuleDef_ptr &();
+ IR_ModuleDef_ptr &ptr (void);
+ IR_ModuleDef_ptr operator-> (void);
-+
+
private:
- ModuleDef_ptr &ptr_;
+ IR_ModuleDef_ptr &ptr_;
@@ -2112,31 +1334,28 @@
- 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 &();
-- // in, inout, out, _retn
++ 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_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
-+
-+ 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
+ IR_ConstantDef_ptr in (void) const;
+ IR_ConstantDef_ptr &inout (void);
+ IR_ConstantDef_ptr &out (void);
@@ -2173,7 +1392,6 @@
- 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 &);
@@ -2183,7 +1401,7 @@
+ operator IR_ConstantDef_ptr &();
+ IR_ConstantDef_ptr &ptr (void);
+ IR_ConstantDef_ptr operator-> (void);
-+
+
private:
- ConstantDef_ptr &ptr_;
+ IR_ConstantDef_ptr &ptr_;
@@ -2213,31 +1431,28 @@
- 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 &();
-- // in, inout, out, _retn
++ 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_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
-+
-+ 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
+ IR_IDLType_ptr in (void) const;
+ IR_IDLType_ptr &inout (void);
+ IR_IDLType_ptr &out (void);
@@ -2274,7 +1489,6 @@
- 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 &);
@@ -2284,7 +1498,7 @@
+ operator IR_IDLType_ptr &();
+ IR_IDLType_ptr &ptr (void);
+ IR_IDLType_ptr operator-> (void);
-+
+
private:
- IDLType_ptr &ptr_;
+ IR_IDLType_ptr &ptr_;
@@ -2314,31 +1528,28 @@
- 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 &();
-- // in, inout, out, _retn
++ 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_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
-+
-+ 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
+ IR_StructDef_ptr in (void) const;
+ IR_StructDef_ptr &inout (void);
+ IR_StructDef_ptr &out (void);
@@ -2375,7 +1586,6 @@
- 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 &);
@@ -2385,20 +1595,13 @@
+ operator IR_StructDef_ptr &();
+ IR_StructDef_ptr &ptr (void);
+ IR_StructDef_ptr operator-> (void);
-+
+
private:
- StructDef_ptr &ptr_;
+ IR_StructDef_ptr &ptr_;
};
-+class TAO_IFR_Client_Export IR_UnionDef_var : public TAO_Base_var
-+{
-+public:
-+ 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
-
+-
-#endif /* end #if !defined */
-
-class UnionDef;
@@ -2409,100 +1612,66 @@
-typedef UnionDef *UnionDef_ptr;
-
-#endif /* end #if !defined */
-+ 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
-+ 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;
-
+-
+-
-#if !defined (_IR_UNIONDEF___VAR_CH_)
-#define _IR_UNIONDEF___VAR_CH_
-+private:
-+ IR_UnionDef_ptr ptr_;
-+ // Unimplemented - prevents widening assignment.
-+ IR_UnionDef_var (const TAO_Base_var &rhs);
-+ IR_UnionDef_var &operator= (const TAO_Base_var &rhs);
-+};
-
+-
-class TAO_IFR_Client_Export UnionDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_UnionDef_out
++class TAO_IFR_Client_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 &();
-- // in, inout, out, _retn
++ 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_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);
++ 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_;
-- // Unimplemented - prevents widening assignment.
++ 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_ptr &ptr_;
++ IR_UnionDef_var (const TAO_Base_var &rhs);
++ IR_UnionDef_var &operator= (const TAO_Base_var &rhs);
};
-+class TAO_IFR_Client_Export IR_EnumDef_var : public TAO_Base_var
-+{
-+public:
-+ 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
-
+-
-#endif /* end #if !defined */
-+ 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
-+ 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;
-
+-
+-
-#if !defined (_IR_UNIONDEF___OUT_CH_)
-#define _IR_UNIONDEF___OUT_CH_
-+private:
-+ IR_EnumDef_ptr ptr_;
-+ // Unimplemented - prevents widening assignment.
-+ IR_EnumDef_var (const TAO_Base_var &rhs);
-+ IR_EnumDef_var &operator= (const TAO_Base_var &rhs);
-+};
-
+-
-class TAO_IFR_Client_Export UnionDef_out
-+class TAO_IFR_Client_Export IR_EnumDef_out
++class TAO_IFR_Client_Export IR_UnionDef_out
{
public:
- UnionDef_out (UnionDef_ptr &);
@@ -2514,30 +1683,22 @@
- operator UnionDef_ptr &();
- UnionDef_ptr &ptr (void);
- UnionDef_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);
-+
++ 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_EnumDef_ptr &ptr_;
++ IR_UnionDef_ptr &ptr_;
};
-+class TAO_IFR_Client_Export IR_AliasDef_var : public TAO_Base_var
-+{
-+public:
-+ 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
-
+-
-#endif /* end #if !defined */
-
-class EnumDef;
@@ -2548,100 +1709,66 @@
-typedef EnumDef *EnumDef_ptr;
-
-#endif /* end #if !defined */
-+ 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
-+ 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;
-
+-
+-
-#if !defined (_IR_ENUMDEF___VAR_CH_)
-#define _IR_ENUMDEF___VAR_CH_
-+private:
-+ IR_AliasDef_ptr ptr_;
-+ // Unimplemented - prevents widening assignment.
-+ IR_AliasDef_var (const TAO_Base_var &rhs);
-+ IR_AliasDef_var &operator= (const TAO_Base_var &rhs);
-+};
-
+-
-class TAO_IFR_Client_Export EnumDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_AliasDef_out
++class TAO_IFR_Client_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 &();
-- // in, inout, out, _retn
++ 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_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);
++ 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_;
-- // Unimplemented - prevents widening assignment.
++ IR_EnumDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
- EnumDef_var (const TAO_Base_var &rhs);
- EnumDef_var &operator= (const TAO_Base_var &rhs);
-+ IR_AliasDef_ptr &ptr_;
++ IR_EnumDef_var (const TAO_Base_var &rhs);
++ IR_EnumDef_var &operator= (const TAO_Base_var &rhs);
};
-+class TAO_IFR_Client_Export IR_InterfaceDef_var : public TAO_Base_var
-+{
-+public:
-+ 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
-
+-
-#endif /* end #if !defined */
-+ 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
-+ 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;
-
+-
+-
-#if !defined (_IR_ENUMDEF___OUT_CH_)
-#define _IR_ENUMDEF___OUT_CH_
-+private:
-+ IR_InterfaceDef_ptr ptr_;
-+ // Unimplemented - prevents widening assignment.
-+ IR_InterfaceDef_var (const TAO_Base_var &rhs);
-+ IR_InterfaceDef_var &operator= (const TAO_Base_var &rhs);
-+};
-
+-
-class TAO_IFR_Client_Export EnumDef_out
-+class TAO_IFR_Client_Export IR_InterfaceDef_out
++class TAO_IFR_Client_Export IR_EnumDef_out
{
public:
- EnumDef_out (EnumDef_ptr &);
@@ -2653,30 +1780,22 @@
- operator EnumDef_ptr &();
- EnumDef_ptr &ptr (void);
- EnumDef_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);
-+
++ 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_InterfaceDef_ptr &ptr_;
++ IR_EnumDef_ptr &ptr_;
};
-+class TAO_IFR_Client_Export IR_ExceptionDef_var : public TAO_Base_var
-+{
-+public:
-+ 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
-
+-
-#endif /* end #if !defined */
-
-class AliasDef;
@@ -2687,100 +1806,66 @@
-typedef AliasDef *AliasDef_ptr;
-
-#endif /* end #if !defined */
-+ 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
-+ 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;
-
+-
+-
-#if !defined (_IR_ALIASDEF___VAR_CH_)
-#define _IR_ALIASDEF___VAR_CH_
-+private:
-+ IR_ExceptionDef_ptr ptr_;
-+ // Unimplemented - prevents widening assignment.
-+ IR_ExceptionDef_var (const TAO_Base_var &rhs);
-+ IR_ExceptionDef_var &operator= (const TAO_Base_var &rhs);
-+};
-
+-
-class TAO_IFR_Client_Export AliasDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_ExceptionDef_out
++class TAO_IFR_Client_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 &();
-- // in, inout, out, _retn
++ 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_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);
++ 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_;
-- // Unimplemented - prevents widening assignment.
++ IR_AliasDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
- AliasDef_var (const TAO_Base_var &rhs);
- AliasDef_var &operator= (const TAO_Base_var &rhs);
-+ IR_ExceptionDef_ptr &ptr_;
++ IR_AliasDef_var (const TAO_Base_var &rhs);
++ IR_AliasDef_var &operator= (const TAO_Base_var &rhs);
};
-+class TAO_IFR_Client_Export IR_NativeDef_var : public TAO_Base_var
-+{
-+public:
-+ 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
-
+-
-#endif /* end #if !defined */
-+ 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
-+ 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;
-
+-
+-
-#if !defined (_IR_ALIASDEF___OUT_CH_)
-#define _IR_ALIASDEF___OUT_CH_
-+private:
-+ IR_NativeDef_ptr ptr_;
-+ // Unimplemented - prevents widening assignment.
-+ IR_NativeDef_var (const TAO_Base_var &rhs);
-+ IR_NativeDef_var &operator= (const TAO_Base_var &rhs);
-+};
-
+-
-class TAO_IFR_Client_Export AliasDef_out
-+class TAO_IFR_Client_Export IR_NativeDef_out
++class TAO_IFR_Client_Export IR_AliasDef_out
{
public:
- AliasDef_out (AliasDef_ptr &);
@@ -2792,20 +1877,19 @@
- operator AliasDef_ptr &();
- AliasDef_ptr &ptr (void);
- AliasDef_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);
-+
++ 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_NativeDef_ptr &ptr_;
++ IR_AliasDef_ptr &ptr_;
};
-
@@ -2825,33 +1909,51 @@
-#define _IR_INTERFACEDEF___VAR_CH_
-
-class TAO_IFR_Client_Export InterfaceDef_var : public TAO_Base_var
--{
--public:
++class TAO_IFR_Client_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 &();
-- // in, inout, out, _retn
++ 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;
--
--private:
++ 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_;
-- // Unimplemented - prevents widening assignment.
++ 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 */
-
@@ -2860,8 +1962,9 @@
-#define _IR_INTERFACEDEF___OUT_CH_
-
-class TAO_IFR_Client_Export InterfaceDef_out
--{
--public:
++class TAO_IFR_Client_Export IR_InterfaceDef_out
+ {
+ public:
- InterfaceDef_out (InterfaceDef_ptr &);
- InterfaceDef_out (InterfaceDef_var &);
- InterfaceDef_out (const InterfaceDef_out &);
@@ -2871,11 +1974,21 @@
- operator InterfaceDef_ptr &();
- InterfaceDef_ptr &ptr (void);
- InterfaceDef_ptr operator-> (void);
--
--private:
++ 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 */
-
@@ -2893,33 +2006,51 @@
-#define _IR_EXCEPTIONDEF___VAR_CH_
-
-class TAO_IFR_Client_Export ExceptionDef_var : public TAO_Base_var
--{
--public:
++class TAO_IFR_Client_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 &();
-- // in, inout, out, _retn
++ 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;
--
--private:
++ 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_;
-- // Unimplemented - prevents widening assignment.
++ 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 */
-
@@ -2928,8 +2059,9 @@
-#define _IR_EXCEPTIONDEF___OUT_CH_
-
-class TAO_IFR_Client_Export ExceptionDef_out
--{
--public:
++class TAO_IFR_Client_Export IR_ExceptionDef_out
+ {
+ public:
- ExceptionDef_out (ExceptionDef_ptr &);
- ExceptionDef_out (ExceptionDef_var &);
- ExceptionDef_out (const ExceptionDef_out &);
@@ -2939,11 +2071,21 @@
- operator ExceptionDef_ptr &();
- ExceptionDef_ptr &ptr (void);
- ExceptionDef_ptr operator-> (void);
--
--private:
++ 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 */
-
@@ -2961,33 +2103,51 @@
-#define _IR_NATIVEDEF___VAR_CH_
-
-class TAO_IFR_Client_Export NativeDef_var : public TAO_Base_var
--{
--public:
++class TAO_IFR_Client_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 &();
-- // in, inout, out, _retn
++ 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;
--
--private:
++ 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_;
-- // Unimplemented - prevents widening assignment.
++ 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 */
-
@@ -2996,8 +2156,9 @@
-#define _IR_NATIVEDEF___OUT_CH_
-
-class TAO_IFR_Client_Export NativeDef_out
--{
--public:
++class TAO_IFR_Client_Export IR_NativeDef_out
+ {
+ public:
- NativeDef_out (NativeDef_ptr &);
- NativeDef_out (NativeDef_var &);
- NativeDef_out (const NativeDef_out &);
@@ -3007,28 +2168,34 @@
- operator NativeDef_ptr &();
- NativeDef_ptr &ptr (void);
- NativeDef_ptr operator-> (void);
--
--private:
++ 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_USE_SEQUENCE_TEMPLATES)
+
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CH_
-+#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);
+@@ -2526,19 +2010,19 @@
_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
@@ -3054,28 +2221,21 @@
virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
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 /* end #if !defined */
-
-+ };
+@@ -2550,193 +2034,139 @@
+
+ };
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+-#endif /* end #if !defined */
+-
-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_INTERFACEDEFSEQ_CH_)
-#define _IR_INTERFACEDEFSEQ_CH_
-
-class InterfaceDefSeq;
-class InterfaceDefSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// InterfaceDefSeq
+// IR_InterfaceDefSeq
@@ -3087,22 +2247,19 @@
_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Object_Sequence<InterfaceDef,InterfaceDef_var>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Object_Sequence<IR_InterfaceDef,IR_InterfaceDef_var>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- InterfaceDefSeq (void); // default ctor
- InterfaceDefSeq (CORBA::ULong max); // uses max size
- InterfaceDefSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- InterfaceDef_ptr *buffer,
+ IR_InterfaceDefSeq (void); // default ctor
+ IR_InterfaceDefSeq (CORBA::ULong max); // uses max size
+ IR_InterfaceDefSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- InterfaceDef_ptr *buffer,
+ IR_InterfaceDef_ptr *buffer,
CORBA::Boolean release = 0
);
@@ -3120,16 +2277,18 @@
};
-#endif /* end #if !defined */
--
++// *************************************************************
++// class IR_InterfaceDefSeq_var
++// *************************************************************
+
-
-#if !defined (_IR_INTERFACEDEFSEQ___VAR_CH_)
-#define _IR_INTERFACEDEFSEQ___VAR_CH_
-
- // *************************************************************
+-// *************************************************************
-// class IR::InterfaceDefSeq_var
-+// class IR_InterfaceDefSeq_var
- // *************************************************************
-
+-// *************************************************************
+-
-class TAO_IFR_Client_Export InterfaceDefSeq_var
+class TAO_IFR_Client_Export IR_InterfaceDefSeq_var
{
@@ -3138,59 +2297,56 @@
- 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);
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- InterfaceDefSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ TAO_Object_Manager<IR_InterfaceDef, IR_InterfaceDef_var> operator[] (CORBA::ULong index);
-
-+ // in, inout, out, _retn
+ const IR_InterfaceDefSeq &in (void) const;
+ IR_InterfaceDefSeq &inout (void);
+ IR_InterfaceDefSeq *&out (void);
+ IR_InterfaceDefSeq *_retn (void);
+ IR_InterfaceDefSeq *ptr (void) const;
--#if !defined (_IR_INTERFACEDEFSEQ___OUT_CH_)
--#define _IR_INTERFACEDEFSEQ___OUT_CH_
-+private:
+ private:
+- InterfaceDefSeq *ptr_;
+ IR_InterfaceDefSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_INTERFACEDEFSEQ___OUT_CH_)
+-#define _IR_INTERFACEDEFSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export InterfaceDefSeq_out
+class TAO_IFR_Client_Export IR_InterfaceDefSeq_out
{
@@ -3204,7 +2360,6 @@
- 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 &);
@@ -3214,7 +2369,7 @@
+ 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_;
@@ -3249,31 +2404,28 @@
- 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 &();
-- // in, inout, out, _retn
++ 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_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
-+
-+ 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
+ IR_ValueDef_ptr in (void) const;
+ IR_ValueDef_ptr &inout (void);
+ IR_ValueDef_ptr &out (void);
@@ -3310,7 +2462,6 @@
- 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 &);
@@ -3320,7 +2471,7 @@
+ operator IR_ValueDef_ptr &();
+ IR_ValueDef_ptr &ptr (void);
+ IR_ValueDef_ptr operator-> (void);
-+
+
private:
- ValueDef_ptr &ptr_;
+ IR_ValueDef_ptr &ptr_;
@@ -3331,17 +2482,14 @@
-
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
+
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CH_
-
+-
class _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
- // = Initialization and termination methods.
--
-+
- _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (void);
+@@ -2746,19 +2176,19 @@
_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
@@ -3367,28 +2515,21 @@
virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
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;
--
-- };
+@@ -2770,261 +2200,184 @@
+
+ };
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
--
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_VALUEDEFSEQ_CH_)
-#define _IR_VALUEDEFSEQ_CH_
-+ };
-
+-
-class ValueDefSeq;
-class ValueDefSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// ValueDefSeq
+// IR_ValueDefSeq
@@ -3400,22 +2541,19 @@
_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Object_Sequence<ValueDef,ValueDef_var>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Object_Sequence<IR_ValueDef,IR_ValueDef_var>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- ValueDefSeq (void); // default ctor
- ValueDefSeq (CORBA::ULong max); // uses max size
- ValueDefSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- ValueDef_ptr *buffer,
+ IR_ValueDefSeq (void); // default ctor
+ IR_ValueDefSeq (CORBA::ULong max); // uses max size
+ IR_ValueDefSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- ValueDef_ptr *buffer,
+ IR_ValueDef_ptr *buffer,
CORBA::Boolean release = 0
);
@@ -3451,59 +2589,56 @@
- 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);
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- ValueDefSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ TAO_Object_Manager<IR_ValueDef, IR_ValueDef_var> operator[] (CORBA::ULong index);
-
-+ // in, inout, out, _retn
+ const IR_ValueDefSeq &in (void) const;
+ IR_ValueDefSeq &inout (void);
+ IR_ValueDefSeq *&out (void);
+ IR_ValueDefSeq *_retn (void);
+ IR_ValueDefSeq *ptr (void) const;
--#if !defined (_IR_VALUEDEFSEQ___OUT_CH_)
--#define _IR_VALUEDEFSEQ___OUT_CH_
-+private:
+ private:
+- ValueDefSeq *ptr_;
+ IR_ValueDefSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_VALUEDEFSEQ___OUT_CH_)
+-#define _IR_VALUEDEFSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export ValueDefSeq_out
+class TAO_IFR_Client_Export IR_ValueDefSeq_out
{
@@ -3517,7 +2652,6 @@
- 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 &);
@@ -3527,7 +2661,7 @@
+ 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_;
@@ -3562,31 +2696,28 @@
- 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 &();
-- // in, inout, out, _retn
++ 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_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
-+
-+ 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
+ IR_ValueBoxDef_ptr in (void) const;
+ IR_ValueBoxDef_ptr &inout (void);
+ IR_ValueBoxDef_ptr &out (void);
@@ -3623,7 +2754,6 @@
- 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 &);
@@ -3633,7 +2763,7 @@
+ operator IR_ValueBoxDef_ptr &();
+ IR_ValueBoxDef_ptr &ptr (void);
+ IR_ValueBoxDef_ptr operator-> (void);
-+
+
private:
- ValueBoxDef_ptr &ptr_;
+ IR_ValueBoxDef_ptr &ptr_;
@@ -3663,31 +2793,28 @@
- 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 &();
-- // in, inout, out, _retn
++ 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_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
-+
-+ 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
+ IR_ComponentDef_ptr in (void) const;
+ IR_ComponentDef_ptr &inout (void);
+ IR_ComponentDef_ptr &out (void);
@@ -3724,7 +2851,6 @@
- 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 &);
@@ -3734,7 +2860,7 @@
+ operator IR_ComponentDef_ptr &();
+ IR_ComponentDef_ptr &ptr (void);
+ IR_ComponentDef_ptr operator-> (void);
-+
+
private:
- ComponentDef_ptr &ptr_;
+ IR_ComponentDef_ptr &ptr_;
@@ -3745,17 +2871,14 @@
-
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
+
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CH_
-
+-
class _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
- // = Initialization and termination methods.
--
-+
- _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void);
+@@ -3034,19 +2387,19 @@
_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
@@ -3781,28 +2904,21 @@
virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
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;
--
-- };
+@@ -3058,193 +2411,139 @@
+
+ };
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
--
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_COMPONENTDEFSEQ_CH_)
-#define _IR_COMPONENTDEFSEQ_CH_
-+ };
-
+-
-class ComponentDefSeq;
-class ComponentDefSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// ComponentDefSeq
+// IR_ComponentDefSeq
@@ -3814,22 +2930,19 @@
_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Object_Sequence<ComponentDef,ComponentDef_var>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Object_Sequence<IR_ComponentDef,IR_ComponentDef_var>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- ComponentDefSeq (void); // default ctor
- ComponentDefSeq (CORBA::ULong max); // uses max size
- ComponentDefSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- ComponentDef_ptr *buffer,
+ IR_ComponentDefSeq (void); // default ctor
+ IR_ComponentDefSeq (CORBA::ULong max); // uses max size
+ IR_ComponentDefSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- ComponentDef_ptr *buffer,
+ IR_ComponentDef_ptr *buffer,
CORBA::Boolean release = 0
);
@@ -3865,59 +2978,56 @@
- 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);
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- ComponentDefSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ TAO_Object_Manager<IR_ComponentDef, IR_ComponentDef_var> operator[] (CORBA::ULong index);
-
-+ // in, inout, out, _retn
+ const IR_ComponentDefSeq &in (void) const;
+ IR_ComponentDefSeq &inout (void);
+ IR_ComponentDefSeq *&out (void);
+ IR_ComponentDefSeq *_retn (void);
+ IR_ComponentDefSeq *ptr (void) const;
--#if !defined (_IR_COMPONENTDEFSEQ___OUT_CH_)
--#define _IR_COMPONENTDEFSEQ___OUT_CH_
-+private:
+ private:
+- ComponentDefSeq *ptr_;
+ IR_ComponentDefSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_COMPONENTDEFSEQ___OUT_CH_)
+-#define _IR_COMPONENTDEFSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export ComponentDefSeq_out
+class TAO_IFR_Client_Export IR_ComponentDefSeq_out
{
@@ -3931,7 +3041,6 @@
- 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 &);
@@ -3941,7 +3050,7 @@
+ 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_;
@@ -3976,31 +3085,28 @@
- 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 &();
-- // in, inout, out, _retn
++ 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_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
-+
-+ 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
+ IR_ProvidesDef_ptr in (void) const;
+ IR_ProvidesDef_ptr &inout (void);
+ IR_ProvidesDef_ptr &out (void);
@@ -4037,7 +3143,6 @@
- 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 &);
@@ -4047,7 +3152,7 @@
+ operator IR_ProvidesDef_ptr &();
+ IR_ProvidesDef_ptr &ptr (void);
+ IR_ProvidesDef_ptr operator-> (void);
-+
+
private:
- ProvidesDef_ptr &ptr_;
+ IR_ProvidesDef_ptr &ptr_;
@@ -4058,17 +3163,14 @@
-
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
+
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CH_
-
+-
class _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
- // = Initialization and termination methods.
--
-+
- _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void);
+@@ -3254,19 +2553,19 @@
_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
@@ -4094,28 +3196,21 @@
virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
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;
--
-- };
--
+@@ -3278,193 +2577,139 @@
+
+ };
+
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-#if !defined (_IR_PROVIDESDEFSEQ_CH_)
-#define _IR_PROVIDESDEFSEQ_CH_
-+ };
-
+-
-class ProvidesDefSeq;
-class ProvidesDefSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// ProvidesDefSeq
+// IR_ProvidesDefSeq
@@ -4127,22 +3222,19 @@
_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Object_Sequence<ProvidesDef,ProvidesDef_var>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Object_Sequence<IR_ProvidesDef,IR_ProvidesDef_var>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- ProvidesDefSeq (void); // default ctor
- ProvidesDefSeq (CORBA::ULong max); // uses max size
- ProvidesDefSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- ProvidesDef_ptr *buffer,
+ IR_ProvidesDefSeq (void); // default ctor
+ IR_ProvidesDefSeq (CORBA::ULong max); // uses max size
+ IR_ProvidesDefSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- ProvidesDef_ptr *buffer,
+ IR_ProvidesDef_ptr *buffer,
CORBA::Boolean release = 0
);
@@ -4178,59 +3270,56 @@
- 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);
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- ProvidesDefSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ TAO_Object_Manager<IR_ProvidesDef, IR_ProvidesDef_var> operator[] (CORBA::ULong index);
-
-+ // in, inout, out, _retn
+ const IR_ProvidesDefSeq &in (void) const;
+ IR_ProvidesDefSeq &inout (void);
+ IR_ProvidesDefSeq *&out (void);
+ IR_ProvidesDefSeq *_retn (void);
+ IR_ProvidesDefSeq *ptr (void) const;
--#if !defined (_IR_PROVIDESDEFSEQ___OUT_CH_)
--#define _IR_PROVIDESDEFSEQ___OUT_CH_
-+private:
+ private:
+- ProvidesDefSeq *ptr_;
+ IR_ProvidesDefSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_PROVIDESDEFSEQ___OUT_CH_)
+-#define _IR_PROVIDESDEFSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export ProvidesDefSeq_out
+class TAO_IFR_Client_Export IR_ProvidesDefSeq_out
{
@@ -4244,7 +3333,6 @@
- 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 &);
@@ -4254,7 +3342,7 @@
+ 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_;
@@ -4289,31 +3377,28 @@
- 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 &();
-- // in, inout, out, _retn
++ 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_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
-+
-+ 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
+ IR_UsesDef_ptr in (void) const;
+ IR_UsesDef_ptr &inout (void);
+ IR_UsesDef_ptr &out (void);
@@ -4350,7 +3435,6 @@
- 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 &);
@@ -4360,7 +3444,7 @@
+ operator IR_UsesDef_ptr &();
+ IR_UsesDef_ptr &ptr (void);
+ IR_UsesDef_ptr operator-> (void);
-+
+
private:
- UsesDef_ptr &ptr_;
+ IR_UsesDef_ptr &ptr_;
@@ -4371,17 +3455,14 @@
-
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
+
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CH_
-
+-
class _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
- // = Initialization and termination methods.
--
-+
- _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void);
+@@ -3474,19 +2719,19 @@
_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
@@ -4407,28 +3488,21 @@
virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
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;
--
-- };
--
+@@ -3498,193 +2743,140 @@
+
+ };
+
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_USESDEFSEQ_CH_)
-#define _IR_USESDEFSEQ_CH_
-+ };
-
+-
-class UsesDefSeq;
-class UsesDefSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// UsesDefSeq
+// IR_UsesDefSeq
@@ -4440,22 +3514,19 @@
_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Object_Sequence<UsesDef,UsesDef_var>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Object_Sequence<IR_UsesDef,IR_UsesDef_var>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- UsesDefSeq (void); // default ctor
- UsesDefSeq (CORBA::ULong max); // uses max size
- UsesDefSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- UsesDef_ptr *buffer,
+ IR_UsesDefSeq (void); // default ctor
+ IR_UsesDefSeq (CORBA::ULong max); // uses max size
+ IR_UsesDefSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- UsesDef_ptr *buffer,
+ IR_UsesDef_ptr *buffer,
CORBA::Boolean release = 0
);
@@ -4491,59 +3562,56 @@
- 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);
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- UsesDefSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ TAO_Object_Manager<IR_UsesDef, IR_UsesDef_var> operator[] (CORBA::ULong index);
-
-+ // in, inout, out, _retn
+ const IR_UsesDefSeq &in (void) const;
+ IR_UsesDefSeq &inout (void);
+ IR_UsesDefSeq *&out (void);
+ IR_UsesDefSeq *_retn (void);
+ IR_UsesDefSeq *ptr (void) const;
--#if !defined (_IR_USESDEFSEQ___OUT_CH_)
--#define _IR_USESDEFSEQ___OUT_CH_
-+private:
+ private:
+- UsesDefSeq *ptr_;
+ IR_UsesDefSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_USESDEFSEQ___OUT_CH_)
+-#define _IR_USESDEFSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export UsesDefSeq_out
+class TAO_IFR_Client_Export IR_UsesDefSeq_out
{
@@ -4557,7 +3625,6 @@
- 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 &);
@@ -4567,7 +3634,7 @@
+ 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_;
@@ -4602,31 +3669,28 @@
- 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 &();
-- // in, inout, out, _retn
++ 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_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
-+
-+ 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
+ IR_HomeDef_ptr in (void) const;
+ IR_HomeDef_ptr &inout (void);
+ IR_HomeDef_ptr &out (void);
@@ -4663,7 +3727,6 @@
- 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 &);
@@ -4673,7 +3736,7 @@
+ operator IR_HomeDef_ptr &();
+ IR_HomeDef_ptr &ptr (void);
+ IR_HomeDef_ptr operator-> (void);
-+
+
private:
- HomeDef_ptr &ptr_;
+ IR_HomeDef_ptr &ptr_;
@@ -4684,17 +3747,14 @@
-
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
+
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CH_
-
+-
class _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
- // = Initialization and termination methods.
--
-+
- _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void);
+@@ -3694,19 +2886,19 @@
_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
@@ -4720,57 +3780,45 @@
virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
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;
--
-+
+@@ -3718,261 +2910,184 @@
+
};
-#endif /* end #if !defined */
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-+// *************************************************************
-+// IR_HomeDefSeq
-+// *************************************************************
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_HOMEDEFSEQ_CH_)
-#define _IR_HOMEDEFSEQ_CH_
-
-class HomeDefSeq;
-class HomeDefSeq_var;
-
--// *************************************************************
+ // *************************************************************
-// HomeDefSeq
--// *************************************************************
--
++// IR_HomeDefSeq
+ // *************************************************************
+
-class TAO_IFR_Client_Export HomeDefSeq : public
+class TAO_IFR_Client_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>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Object_Sequence<IR_HomeDef,IR_HomeDef_var>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- HomeDefSeq (void); // default ctor
- HomeDefSeq (CORBA::ULong max); // uses max size
- HomeDefSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- HomeDef_ptr *buffer,
+ IR_HomeDefSeq (void); // default ctor
+ IR_HomeDefSeq (CORBA::ULong max); // uses max size
+ IR_HomeDefSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- HomeDef_ptr *buffer,
+ IR_HomeDef_ptr *buffer,
CORBA::Boolean release = 0
);
@@ -4806,59 +3854,56 @@
- 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);
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- HomeDefSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ TAO_Object_Manager<IR_HomeDef, IR_HomeDef_var> operator[] (CORBA::ULong index);
-
-+ // in, inout, out, _retn
+ const IR_HomeDefSeq &in (void) const;
+ IR_HomeDefSeq &inout (void);
+ IR_HomeDefSeq *&out (void);
+ IR_HomeDefSeq *_retn (void);
+ IR_HomeDefSeq *ptr (void) const;
--#if !defined (_IR_HOMEDEFSEQ___OUT_CH_)
--#define _IR_HOMEDEFSEQ___OUT_CH_
-+private:
+ private:
+- HomeDefSeq *ptr_;
+ IR_HomeDefSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_HOMEDEFSEQ___OUT_CH_)
+-#define _IR_HOMEDEFSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export HomeDefSeq_out
+class TAO_IFR_Client_Export IR_HomeDefSeq_out
{
@@ -4872,7 +3917,6 @@
- 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 &);
@@ -4882,7 +3926,7 @@
+ 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_;
@@ -4917,31 +3961,28 @@
- 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 &();
-- // in, inout, out, _retn
++ 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_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
-+
-+ 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
+ IR_EventDef_ptr in (void) const;
+ IR_EventDef_ptr &inout (void);
+ IR_EventDef_ptr &out (void);
@@ -4978,7 +4019,6 @@
- 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 &);
@@ -4988,7 +4028,7 @@
+ operator IR_EventDef_ptr &();
+ IR_EventDef_ptr &ptr (void);
+ IR_EventDef_ptr operator-> (void);
-+
+
private:
- EventDef_ptr &ptr_;
+ IR_EventDef_ptr &ptr_;
@@ -5018,31 +4058,28 @@
- 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 &();
-- // in, inout, out, _retn
++ 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_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
-+
-+ 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
+ IR_EmitsDef_ptr in (void) const;
+ IR_EmitsDef_ptr &inout (void);
+ IR_EmitsDef_ptr &out (void);
@@ -5079,7 +4116,6 @@
- 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 &);
@@ -5089,7 +4125,7 @@
+ operator IR_EmitsDef_ptr &();
+ IR_EmitsDef_ptr &ptr (void);
+ IR_EmitsDef_ptr operator-> (void);
-+
+
private:
- EmitsDef_ptr &ptr_;
+ IR_EmitsDef_ptr &ptr_;
@@ -5100,17 +4136,14 @@
-
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
+
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CH_
-
+-
class _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
- // = Initialization and termination methods.
--
-+
- _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void);
+@@ -3982,19 +3097,19 @@
_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
@@ -5136,28 +4169,21 @@
virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
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;
--
-- };
--
+@@ -4006,193 +3121,139 @@
+
+ };
+
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_EMITSDEFSEQ_CH_)
-#define _IR_EMITSDEFSEQ_CH_
-+ };
-
+-
-class EmitsDefSeq;
-class EmitsDefSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// EmitsDefSeq
+// IR_EmitsDefSeq
@@ -5169,22 +4195,19 @@
_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Object_Sequence<EmitsDef,EmitsDef_var>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Object_Sequence<IR_EmitsDef,IR_EmitsDef_var>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- EmitsDefSeq (void); // default ctor
- EmitsDefSeq (CORBA::ULong max); // uses max size
- EmitsDefSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- EmitsDef_ptr *buffer,
+ IR_EmitsDefSeq (void); // default ctor
+ IR_EmitsDefSeq (CORBA::ULong max); // uses max size
+ IR_EmitsDefSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- EmitsDef_ptr *buffer,
+ IR_EmitsDef_ptr *buffer,
CORBA::Boolean release = 0
);
@@ -5220,59 +4243,56 @@
- 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);
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- EmitsDefSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ TAO_Object_Manager<IR_EmitsDef, IR_EmitsDef_var> operator[] (CORBA::ULong index);
-
-+ // in, inout, out, _retn
+ const IR_EmitsDefSeq &in (void) const;
+ IR_EmitsDefSeq &inout (void);
+ IR_EmitsDefSeq *&out (void);
+ IR_EmitsDefSeq *_retn (void);
+ IR_EmitsDefSeq *ptr (void) const;
--#if !defined (_IR_EMITSDEFSEQ___OUT_CH_)
--#define _IR_EMITSDEFSEQ___OUT_CH_
-+private:
+ private:
+- EmitsDefSeq *ptr_;
+ IR_EmitsDefSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_EMITSDEFSEQ___OUT_CH_)
+-#define _IR_EMITSDEFSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export EmitsDefSeq_out
+class TAO_IFR_Client_Export IR_EmitsDefSeq_out
{
@@ -5286,7 +4306,6 @@
- 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 &);
@@ -5296,7 +4315,7 @@
+ 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_;
@@ -5331,31 +4350,28 @@
- 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 &();
-- // in, inout, out, _retn
++ 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_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
-+
-+ 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
+ IR_PublishesDef_ptr in (void) const;
+ IR_PublishesDef_ptr &inout (void);
+ IR_PublishesDef_ptr &out (void);
@@ -5392,7 +4408,6 @@
- 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 &);
@@ -5402,7 +4417,7 @@
+ operator IR_PublishesDef_ptr &();
+ IR_PublishesDef_ptr &ptr (void);
+ IR_PublishesDef_ptr operator-> (void);
-+
+
private:
- PublishesDef_ptr &ptr_;
+ IR_PublishesDef_ptr &ptr_;
@@ -5413,17 +4428,14 @@
-
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
+
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CH_
-
+-
class _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
- // = Initialization and termination methods.
--
-+
- _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void);
+@@ -4202,19 +3263,19 @@
_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
@@ -5449,28 +4461,21 @@
virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
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 /* end #if !defined */
-
-+ };
+@@ -4226,193 +3287,139 @@
+
+ };
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+-#endif /* end #if !defined */
+-
-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_PUBLISHESDEFSEQ_CH_)
-#define _IR_PUBLISHESDEFSEQ_CH_
-
-class PublishesDefSeq;
-class PublishesDefSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// PublishesDefSeq
+// IR_PublishesDefSeq
@@ -5482,22 +4487,19 @@
_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Object_Sequence<PublishesDef,PublishesDef_var>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Object_Sequence<IR_PublishesDef,IR_PublishesDef_var>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- PublishesDefSeq (void); // default ctor
- PublishesDefSeq (CORBA::ULong max); // uses max size
- PublishesDefSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- PublishesDef_ptr *buffer,
+ IR_PublishesDefSeq (void); // default ctor
+ IR_PublishesDefSeq (CORBA::ULong max); // uses max size
+ IR_PublishesDefSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- PublishesDef_ptr *buffer,
+ IR_PublishesDef_ptr *buffer,
CORBA::Boolean release = 0
);
@@ -5533,59 +4535,56 @@
- 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);
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- PublishesDefSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ TAO_Object_Manager<IR_PublishesDef, IR_PublishesDef_var> operator[] (CORBA::ULong index);
-
-+ // in, inout, out, _retn
+ const IR_PublishesDefSeq &in (void) const;
+ IR_PublishesDefSeq &inout (void);
+ IR_PublishesDefSeq *&out (void);
+ IR_PublishesDefSeq *_retn (void);
+ IR_PublishesDefSeq *ptr (void) const;
--#if !defined (_IR_PUBLISHESDEFSEQ___OUT_CH_)
--#define _IR_PUBLISHESDEFSEQ___OUT_CH_
-+private:
+ private:
+- PublishesDefSeq *ptr_;
+ IR_PublishesDefSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_PUBLISHESDEFSEQ___OUT_CH_)
+-#define _IR_PUBLISHESDEFSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export PublishesDefSeq_out
+class TAO_IFR_Client_Export IR_PublishesDefSeq_out
{
@@ -5599,7 +4598,6 @@
- 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 &);
@@ -5609,7 +4607,7 @@
+ 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_;
@@ -5644,31 +4642,28 @@
- 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 &();
-- // in, inout, out, _retn
++ 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_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
-+
-+ 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
+ IR_ConsumesDef_ptr in (void) const;
+ IR_ConsumesDef_ptr &inout (void);
+ IR_ConsumesDef_ptr &out (void);
@@ -5705,7 +4700,6 @@
- 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 &);
@@ -5715,7 +4709,7 @@
+ operator IR_ConsumesDef_ptr &();
+ IR_ConsumesDef_ptr &ptr (void);
+ IR_ConsumesDef_ptr operator-> (void);
-+
+
private:
- ConsumesDef_ptr &ptr_;
+ IR_ConsumesDef_ptr &ptr_;
@@ -5726,17 +4720,14 @@
-
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
+
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CH_
-
+-
class _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
- // = Initialization and termination methods.
--
-+
- _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void);
+@@ -4422,19 +3429,19 @@
_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
@@ -5762,28 +4753,21 @@
virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
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;
--
-- };
+@@ -4446,193 +3453,139 @@
+
+ };
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
--
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_CONSUMESDEFSEQ_CH_)
-#define _IR_CONSUMESDEFSEQ_CH_
-+ };
-
+-
-class ConsumesDefSeq;
-class ConsumesDefSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// ConsumesDefSeq
+// IR_ConsumesDefSeq
@@ -5795,22 +4779,19 @@
_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Object_Sequence<ConsumesDef,ConsumesDef_var>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Object_Sequence<IR_ConsumesDef,IR_ConsumesDef_var>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- ConsumesDefSeq (void); // default ctor
- ConsumesDefSeq (CORBA::ULong max); // uses max size
- ConsumesDefSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- ConsumesDef_ptr *buffer,
+ IR_ConsumesDefSeq (void); // default ctor
+ IR_ConsumesDefSeq (CORBA::ULong max); // uses max size
+ IR_ConsumesDefSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- ConsumesDef_ptr *buffer,
+ IR_ConsumesDef_ptr *buffer,
CORBA::Boolean release = 0
);
@@ -5846,59 +4827,56 @@
- 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);
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- ConsumesDefSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ TAO_Object_Manager<IR_ConsumesDef, IR_ConsumesDef_var> operator[] (CORBA::ULong index);
-
-+ // in, inout, out, _retn
+ const IR_ConsumesDefSeq &in (void) const;
+ IR_ConsumesDefSeq &inout (void);
+ IR_ConsumesDefSeq *&out (void);
+ IR_ConsumesDefSeq *_retn (void);
+ IR_ConsumesDefSeq *ptr (void) const;
--#if !defined (_IR_CONSUMESDEFSEQ___OUT_CH_)
--#define _IR_CONSUMESDEFSEQ___OUT_CH_
-+private:
+ private:
+- ConsumesDefSeq *ptr_;
+ IR_ConsumesDefSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_CONSUMESDEFSEQ___OUT_CH_)
+-#define _IR_CONSUMESDEFSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export ConsumesDefSeq_out
+class TAO_IFR_Client_Export IR_ConsumesDefSeq_out
{
@@ -5912,7 +4890,6 @@
- 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 &);
@@ -5922,7 +4899,7 @@
+ 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_;
@@ -5957,31 +4934,28 @@
- 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 &();
-- // in, inout, out, _retn
++ 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_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
-+
-+ 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
+ IR_FactoryDef_ptr in (void) const;
+ IR_FactoryDef_ptr &inout (void);
+ IR_FactoryDef_ptr &out (void);
@@ -6018,7 +4992,6 @@
- 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 &);
@@ -6028,7 +5001,7 @@
+ operator IR_FactoryDef_ptr &();
+ IR_FactoryDef_ptr &ptr (void);
+ IR_FactoryDef_ptr operator-> (void);
-+
+
private:
- FactoryDef_ptr &ptr_;
+ IR_FactoryDef_ptr &ptr_;
@@ -6039,17 +5012,14 @@
-
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
+
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CH_
-
+-
class _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
- // = Initialization and termination methods.
--
-+
- _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void);
+@@ -4642,19 +3595,19 @@
_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
@@ -6075,28 +5045,21 @@
virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
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;
--
-- };
--
+@@ -4666,193 +3619,139 @@
+
+ };
+
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-#if !defined (_IR_FACTORYDEFSEQ_CH_)
-#define _IR_FACTORYDEFSEQ_CH_
-+ };
-
+-
-class FactoryDefSeq;
-class FactoryDefSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// FactoryDefSeq
+// IR_FactoryDefSeq
@@ -6108,22 +5071,19 @@
_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Object_Sequence<FactoryDef,FactoryDef_var>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Object_Sequence<IR_FactoryDef,IR_FactoryDef_var>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- FactoryDefSeq (void); // default ctor
- FactoryDefSeq (CORBA::ULong max); // uses max size
- FactoryDefSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- FactoryDef_ptr *buffer,
+ IR_FactoryDefSeq (void); // default ctor
+ IR_FactoryDefSeq (CORBA::ULong max); // uses max size
+ IR_FactoryDefSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- FactoryDef_ptr *buffer,
+ IR_FactoryDef_ptr *buffer,
CORBA::Boolean release = 0
);
@@ -6159,59 +5119,56 @@
- 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);
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- FactoryDefSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ TAO_Object_Manager<IR_FactoryDef, IR_FactoryDef_var> operator[] (CORBA::ULong index);
-
-+ // in, inout, out, _retn
+ const IR_FactoryDefSeq &in (void) const;
+ IR_FactoryDefSeq &inout (void);
+ IR_FactoryDefSeq *&out (void);
+ IR_FactoryDefSeq *_retn (void);
+ IR_FactoryDefSeq *ptr (void) const;
--#if !defined (_IR_FACTORYDEFSEQ___OUT_CH_)
--#define _IR_FACTORYDEFSEQ___OUT_CH_
-+private:
+ private:
+- FactoryDefSeq *ptr_;
+ IR_FactoryDefSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_FACTORYDEFSEQ___OUT_CH_)
+-#define _IR_FACTORYDEFSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export FactoryDefSeq_out
+class TAO_IFR_Client_Export IR_FactoryDefSeq_out
{
@@ -6225,7 +5182,6 @@
- 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 &);
@@ -6235,7 +5191,7 @@
+ 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_;
@@ -6270,31 +5226,28 @@
- 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 &();
-- // in, inout, out, _retn
++ 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_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
-+
-+ 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
+ IR_FinderDef_ptr in (void) const;
+ IR_FinderDef_ptr &inout (void);
+ IR_FinderDef_ptr &out (void);
@@ -6331,7 +5284,6 @@
- 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 &);
@@ -6341,7 +5293,7 @@
+ operator IR_FinderDef_ptr &();
+ IR_FinderDef_ptr &ptr (void);
+ IR_FinderDef_ptr operator-> (void);
-+
+
private:
- FinderDef_ptr &ptr_;
+ IR_FinderDef_ptr &ptr_;
@@ -6352,17 +5304,14 @@
-
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
+
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CH_
-
+-
class _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
- // = Initialization and termination methods.
--
-+
- _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void);
+@@ -4862,19 +3761,19 @@
_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
@@ -6388,28 +5337,21 @@
virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
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;
--
-- };
--
+@@ -4886,193 +3785,139 @@
+
+ };
+
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_FINDERDEFSEQ_CH_)
-#define _IR_FINDERDEFSEQ_CH_
-+ };
-
+-
-class FinderDefSeq;
-class FinderDefSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// FinderDefSeq
+// IR_FinderDefSeq
@@ -6421,22 +5363,19 @@
_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Object_Sequence<FinderDef,FinderDef_var>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Object_Sequence<IR_FinderDef,IR_FinderDef_var>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- FinderDefSeq (void); // default ctor
- FinderDefSeq (CORBA::ULong max); // uses max size
- FinderDefSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- FinderDef_ptr *buffer,
+ IR_FinderDefSeq (void); // default ctor
+ IR_FinderDefSeq (CORBA::ULong max); // uses max size
+ IR_FinderDefSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- FinderDef_ptr *buffer,
+ IR_FinderDef_ptr *buffer,
CORBA::Boolean release = 0
);
@@ -6472,59 +5411,56 @@
- 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);
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- FinderDefSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ TAO_Object_Manager<IR_FinderDef, IR_FinderDef_var> operator[] (CORBA::ULong index);
-
-+ // in, inout, out, _retn
+ const IR_FinderDefSeq &in (void) const;
+ IR_FinderDefSeq &inout (void);
+ IR_FinderDefSeq *&out (void);
+ IR_FinderDefSeq *_retn (void);
+ IR_FinderDefSeq *ptr (void) const;
--#if !defined (_IR_FINDERDEFSEQ___OUT_CH_)
--#define _IR_FINDERDEFSEQ___OUT_CH_
-+private:
+ private:
+- FinderDefSeq *ptr_;
+ IR_FinderDefSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_FINDERDEFSEQ___OUT_CH_)
+-#define _IR_FINDERDEFSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export FinderDefSeq_out
+class TAO_IFR_Client_Export IR_FinderDefSeq_out
{
@@ -6538,7 +5474,6 @@
- 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 &);
@@ -6548,7 +5483,7 @@
+ 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_;
@@ -6583,31 +5518,28 @@
- 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 &();
-- // in, inout, out, _retn
++ 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_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
-+
-+ 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
+ IR_PrimaryKeyDef_ptr in (void) const;
+ IR_PrimaryKeyDef_ptr &inout (void);
+ IR_PrimaryKeyDef_ptr &out (void);
@@ -6644,7 +5576,6 @@
- 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 &);
@@ -6654,7 +5585,7 @@
+ operator IR_PrimaryKeyDef_ptr &();
+ IR_PrimaryKeyDef_ptr &ptr (void);
+ IR_PrimaryKeyDef_ptr operator-> (void);
-+
+
private:
- PrimaryKeyDef_ptr &ptr_;
+ IR_PrimaryKeyDef_ptr &ptr_;
@@ -6665,17 +5596,14 @@
-
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
+
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CH_
-
+-
class _TAO_Unbounded_Object_Sequence_IR_ContainedSeq : public TAO_Unbounded_Base_Sequence
{
public:
- // = Initialization and termination methods.
--
-+
- _TAO_Unbounded_Object_Sequence_IR_ContainedSeq (void);
+@@ -5082,19 +3927,19 @@
_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum,
CORBA::ULong length,
@@ -6701,28 +5629,21 @@
virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
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 /* end #if !defined */
-
-+ };
+@@ -5106,191 +3951,156 @@
+
+ };
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+-#endif /* end #if !defined */
-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_CONTAINEDSEQ_CH_)
-#define _IR_CONTAINEDSEQ_CH_
-
-class ContainedSeq;
-class ContainedSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// ContainedSeq
+// IR_ContainedSeq
@@ -6734,22 +5655,19 @@
_TAO_Unbounded_Object_Sequence_IR_ContainedSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Object_Sequence<Contained,Contained_var>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Object_Sequence<IR_Contained,IR_Contained_var>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- ContainedSeq (void); // default ctor
- ContainedSeq (CORBA::ULong max); // uses max size
- ContainedSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- Contained_ptr *buffer,
+ IR_ContainedSeq (void); // default ctor
+ IR_ContainedSeq (CORBA::ULong max); // uses max size
+ IR_ContainedSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- Contained_ptr *buffer,
+ IR_Contained_ptr *buffer,
CORBA::Boolean release = 0
);
@@ -6761,17 +5679,19 @@
#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 */
+-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
+-};
+-
+-#endif /* end #if !defined */
-
++ typedef IR_ContainedSeq_var _var_type;
++#endif /* ! __GNUC__ || g++ >= 2.8 */
+
-#if !defined (_IR_CONTAINEDSEQ___VAR_CH_)
-#define _IR_CONTAINEDSEQ___VAR_CH_
--
++};
+
// *************************************************************
-// class IR::ContainedSeq_var
+// class IR_ContainedSeq_var
@@ -6785,61 +5705,57 @@
- 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);
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- ContainedSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ TAO_Object_Manager<IR_Contained, IR_Contained_var> operator[] (CORBA::ULong index);
-
-+ // in, inout, out, _retn
+ const IR_ContainedSeq &in (void) const;
+ IR_ContainedSeq &inout (void);
+ IR_ContainedSeq *&out (void);
+ IR_ContainedSeq *_retn (void);
+ IR_ContainedSeq *ptr (void) const;
--#if !defined (_IR_CONTAINEDSEQ___OUT_CH_)
--#define _IR_CONTAINEDSEQ___OUT_CH_
-+private:
+ private:
+- ContainedSeq *ptr_;
+ IR_ContainedSeq *ptr_;
-+};
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_CONTAINEDSEQ___OUT_CH_)
+-#define _IR_CONTAINEDSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export ContainedSeq_out
-+
+class TAO_IFR_Client_Export IR_ContainedSeq_out
{
public:
@@ -6852,7 +5768,6 @@
- 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 &);
@@ -6862,7 +5777,7 @@
+ 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_;
@@ -6904,73 +5819,58 @@
- 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
--
-- // in, inout, out, _retn
++ 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;
--
--private:
-- StructMember *ptr_;
--};
--
--class TAO_IFR_Client_Export 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_var (void); // default constructor
-+ 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
+ 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_;
-- // assignment from T_var not allowed
-- void operator= (const StructMember_var &);
+- StructMember *ptr_;
+ IR_StructMember *ptr_;
};
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StructMember;
+-class TAO_IFR_Client_Export StructMember_out
+class TAO_IFR_Client_Export IR_StructMember_out
-+{
-+public:
+ {
+ 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 &);
@@ -6979,27 +5879,28 @@
+ operator IR_StructMember *&();
+ IR_StructMember *&ptr (void);
+ IR_StructMember *operator-> (void);
-
-+private:
+
+ private:
+- StructMember *&ptr_;
+ IR_StructMember *&ptr_;
-+ // assignment from T_var not allowed
+ // 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_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CH_
-
+-
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);
+@@ -5300,214 +4110,178 @@
+ _TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum,
CORBA::ULong length,
- StructMember *data,
@@ -7021,10 +5922,9 @@
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,
@@ -7037,15 +5937,14 @@
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
--
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_STRUCTMEMBERSEQ_CH_)
-#define _IR_STRUCTMEMBERSEQ_CH_
-
-class StructMemberSeq;
-class StructMemberSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// StructMemberSeq
+// IR_StructMemberSeq
@@ -7057,22 +5956,19 @@
_TAO_Unbounded_Sequence_IR_StructMemberSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Sequence<StructMember>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Sequence<IR_StructMember>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- StructMemberSeq (void); // default ctor
- StructMemberSeq (CORBA::ULong max); // uses max size
- StructMemberSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- StructMember *buffer,
+ IR_StructMemberSeq (void); // default ctor
+ IR_StructMemberSeq (CORBA::ULong max); // uses max size
+ IR_StructMemberSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- StructMember *buffer,
+ IR_StructMember *buffer,
CORBA::Boolean release = 0
);
@@ -7108,61 +6004,58 @@
- 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;
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- StructMemberSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ 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);
+ IR_StructMemberSeq *_retn (void);
+ IR_StructMemberSeq *ptr (void) const;
--#if !defined (_IR_STRUCTMEMBERSEQ___OUT_CH_)
--#define _IR_STRUCTMEMBERSEQ___OUT_CH_
-+private:
+ private:
+- StructMemberSeq *ptr_;
+ IR_StructMemberSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_STRUCTMEMBERSEQ___OUT_CH_)
+-#define _IR_STRUCTMEMBERSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export StructMemberSeq_out
+class TAO_IFR_Client_Export IR_StructMemberSeq_out
{
@@ -7176,7 +6069,6 @@
- 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 &);
@@ -7186,7 +6078,7 @@
+ IR_StructMemberSeq *&ptr (void);
+ IR_StructMemberSeq *operator-> (void);
+ IR_StructMember & operator[] (CORBA::ULong index);
-+
+
private:
- StructMemberSeq *&ptr_;
+ IR_StructMemberSeq *&ptr_;
@@ -7227,73 +6119,58 @@
- Initializer_var (Initializer *);
- Initializer_var (const Initializer_var &); // copy constructor
- ~Initializer_var (void); // destructor
--
++ 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
+
- Initializer_var &operator= (Initializer *);
- Initializer_var &operator= (const Initializer_var &);
- Initializer *operator-> (void);
- const Initializer *operator-> (void) const;
--
++ 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 Initializer &() const;
- operator Initializer &();
- operator Initializer &() const;
- operator Initializer *&(); // variable-size types only
--
-- // in, inout, out, _retn
++ 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;
--
--private:
-- Initializer *ptr_;
--};
--
--class TAO_IFR_Client_Export 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_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 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_;
-- // assignment from T_var not allowed
-- void operator= (const Initializer_var &);
+- Initializer *ptr_;
+ IR_Initializer *ptr_;
};
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Initializer;
+-class TAO_IFR_Client_Export Initializer_out
+class TAO_IFR_Client_Export IR_Initializer_out
-+{
-+public:
+ {
+ 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 &);
@@ -7302,27 +6179,28 @@
+ operator IR_Initializer *&();
+ IR_Initializer *&ptr (void);
+ IR_Initializer *operator-> (void);
-
-+private:
+
+ private:
+- Initializer *&ptr_;
+ IR_Initializer *&ptr_;
-+ // assignment from T_var not allowed
+ // 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_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CH_
-
+-
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);
+@@ -5517,151 +4291,121 @@
+ _TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum,
CORBA::ULong length,
- Initializer *data,
@@ -7344,10 +6222,9 @@
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,
@@ -7360,15 +6237,14 @@
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
--
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_INITIALIZERSEQ_CH_)
-#define _IR_INITIALIZERSEQ_CH_
-
-class InitializerSeq;
-class InitializerSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// InitializerSeq
+// IR_InitializerSeq
@@ -7380,22 +6256,19 @@
_TAO_Unbounded_Sequence_IR_InitializerSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Sequence<Initializer>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Sequence<IR_Initializer>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- InitializerSeq (void); // default ctor
- InitializerSeq (CORBA::ULong max); // uses max size
- InitializerSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- Initializer *buffer,
+ IR_InitializerSeq (void); // default ctor
+ IR_InitializerSeq (CORBA::ULong max); // uses max size
+ IR_InitializerSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- Initializer *buffer,
+ IR_Initializer *buffer,
CORBA::Boolean release = 0
);
@@ -7431,61 +6304,58 @@
- 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;
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- InitializerSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ 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);
+ IR_InitializerSeq *_retn (void);
+ IR_InitializerSeq *ptr (void) const;
--#if !defined (_IR_INITIALIZERSEQ___OUT_CH_)
--#define _IR_INITIALIZERSEQ___OUT_CH_
-+private:
+ private:
+- InitializerSeq *ptr_;
+ IR_InitializerSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_INITIALIZERSEQ___OUT_CH_)
+-#define _IR_INITIALIZERSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export InitializerSeq_out
+class TAO_IFR_Client_Export IR_InitializerSeq_out
{
@@ -7499,7 +6369,6 @@
- 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 &);
@@ -7509,7 +6378,7 @@
+ IR_InitializerSeq *&ptr (void);
+ IR_InitializerSeq *operator-> (void);
+ IR_Initializer & operator[] (CORBA::ULong index);
-+
+
private:
- InitializerSeq *&ptr_;
+ IR_InitializerSeq *&ptr_;
@@ -7536,7 +6405,7 @@
#endif /* ! __GNUC__ || g++ >= 2.8 */
static void _tao_any_destructor (void*);
-@@ -5670,449 +3848,319 @@
+@@ -5669,64 +4413,58 @@
TAO_String_Manager name;
CORBA::Any label;
CORBA::TypeCode_var type;
@@ -7552,73 +6421,58 @@
- 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
--
-- // in, inout, out, _retn
++ 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;
--
--private:
-- UnionMember *ptr_;
--};
--
--class TAO_IFR_Client_Export 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_var (void); // default constructor
-+ 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
+ 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_;
-- // assignment from T_var not allowed
-- void operator= (const UnionMember_var &);
+- UnionMember *ptr_;
+ IR_UnionMember *ptr_;
};
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UnionMember;
+-class TAO_IFR_Client_Export UnionMember_out
+class TAO_IFR_Client_Export IR_UnionMember_out
-+{
-+public:
+ {
+ 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 &);
@@ -7627,27 +6481,28 @@
+ operator IR_UnionMember *&();
+ IR_UnionMember *&ptr (void);
+ IR_UnionMember *operator-> (void);
-
-+private:
+
+ private:
+- UnionMember *&ptr_;
+ IR_UnionMember *&ptr_;
-+ // assignment from T_var not allowed
+ // 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_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CH_
-
+-
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);
+@@ -5736,155 +4474,121 @@
+ _TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum,
CORBA::ULong length,
- UnionMember *data,
@@ -7669,10 +6524,9 @@
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,
@@ -7685,15 +6539,14 @@
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
--
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_UNIONMEMBERSEQ_CH_)
-#define _IR_UNIONMEMBERSEQ_CH_
-
-class UnionMemberSeq;
-class UnionMemberSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// UnionMemberSeq
+// IR_UnionMemberSeq
@@ -7705,22 +6558,19 @@
_TAO_Unbounded_Sequence_IR_UnionMemberSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Sequence<UnionMember>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Sequence<IR_UnionMember>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- UnionMemberSeq (void); // default ctor
- UnionMemberSeq (CORBA::ULong max); // uses max size
- UnionMemberSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- UnionMember *buffer,
+ IR_UnionMemberSeq (void); // default ctor
+ IR_UnionMemberSeq (CORBA::ULong max); // uses max size
+ IR_UnionMemberSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- UnionMember *buffer,
+ IR_UnionMember *buffer,
CORBA::Boolean release = 0
);
@@ -7756,61 +6606,58 @@
- 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;
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- UnionMemberSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ 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);
+ IR_UnionMemberSeq *_retn (void);
+ IR_UnionMemberSeq *ptr (void) const;
--#if !defined (_IR_UNIONMEMBERSEQ___OUT_CH_)
--#define _IR_UNIONMEMBERSEQ___OUT_CH_
-+private:
+ private:
+- UnionMemberSeq *ptr_;
+ IR_UnionMemberSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_UNIONMEMBERSEQ___OUT_CH_)
+-#define _IR_UNIONMEMBERSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export UnionMemberSeq_out
+class TAO_IFR_Client_Export IR_UnionMemberSeq_out
{
@@ -7824,7 +6671,6 @@
- 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 &);
@@ -7834,7 +6680,7 @@
+ IR_UnionMemberSeq *&ptr (void);
+ IR_UnionMemberSeq *operator-> (void);
+ IR_UnionMember & operator[] (CORBA::ULong index);
-+
+
private:
- UnionMemberSeq *&ptr_;
+ IR_UnionMemberSeq *&ptr_;
@@ -7865,23 +6711,19 @@
#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 */
+@@ -5892,202 +4596,112 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- EnumMemberSeq (void); // default ctor
- EnumMemberSeq (CORBA::ULong max); // uses max size
- EnumMemberSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- char * *buffer,
+ IR_EnumMemberSeq (void); // default ctor
+ IR_EnumMemberSeq (CORBA::ULong max); // uses max size
+ IR_EnumMemberSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
-+ char * *buffer,
+ CORBA::ULong max,
+ CORBA::ULong length,
+ char * *buffer,
CORBA::Boolean release = 0
);
- EnumMemberSeq (const EnumMemberSeq &); // copy ctor
@@ -7916,52 +6758,59 @@
- 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
--
-- TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
--
-- // in, inout, out, _retn
++ 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;
--
--private:
++ 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_var (void); // default constructor
-+ IR_EnumMemberSeq_var (IR_EnumMemberSeq *);
-+ IR_EnumMemberSeq_var (const IR_EnumMemberSeq_var &); // copy constructor
-+ ~IR_EnumMemberSeq_var (void); // destructor
++ IR_EnumMemberSeq *ptr_;
+ };
+-
-#endif /* end #if !defined */
-+ 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
-
+-
+-
-#if !defined (_IR_ENUMMEMBERSEQ___OUT_CH_)
-#define _IR_ENUMMEMBERSEQ___OUT_CH_
-
-class TAO_IFR_Client_Export EnumMemberSeq_out
--{
--public:
++class TAO_IFR_Client_Export IR_EnumMemberSeq_out
+ {
+ public:
- EnumMemberSeq_out (EnumMemberSeq *&);
- EnumMemberSeq_out (EnumMemberSeq_var &);
- EnumMemberSeq_out (const EnumMemberSeq_out &);
@@ -7970,11 +6819,20 @@
- 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:
+
+ private:
- EnumMemberSeq *&ptr_;
-- // assignment from T_var not allowed
++ IR_EnumMemberSeq *&ptr_;
+ // assignment from T_var not allowed
- void operator= (const EnumMemberSeq_var &);
-};
-
@@ -7983,7 +6841,7 @@
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnumMemberSeq;
-
-
+-
-#if !defined (_IR_CONTAINER___PTR_CH_)
-#define _IR_CONTAINER___PTR_CH_
-
@@ -8016,21 +6874,14 @@
- Container_ptr &out (void);
- Container_ptr _retn (void);
- Container_ptr ptr (void) const;
-+ // in, inout, out, _retn
-+ const IR_EnumMemberSeq &in (void) const;
-+ IR_EnumMemberSeq &inout (void);
-+ IR_EnumMemberSeq *&out (void);
-+ IR_EnumMemberSeq *_retn (void);
-+ IR_EnumMemberSeq *ptr (void) const;
-
- private:
+-
+-private:
- Container_ptr ptr_;
- // Unimplemented - prevents widening assignment.
- Container_var (const TAO_Base_var &rhs);
- Container_var &operator= (const TAO_Base_var &rhs);
-+ IR_EnumMemberSeq *ptr_;
- };
-
+-};
+-
-
-#endif /* end #if !defined */
-
@@ -8039,9 +6890,8 @@
-#define _IR_CONTAINER___OUT_CH_
-
-class TAO_IFR_Client_Export Container_out
-+class TAO_IFR_Client_Export IR_EnumMemberSeq_out
- {
- public:
+-{
+-public:
- Container_out (Container_ptr &);
- Container_out (Container_var &);
- Container_out (const Container_out &);
@@ -8052,20 +6902,8 @@
- Container_ptr &ptr (void);
- Container_ptr 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:
+-private:
- Container_ptr &ptr_;
-+ IR_EnumMemberSeq *&ptr_;
-+ // assignment from T_var not allowed
+ void operator= (const IR_EnumMemberSeq_var &);
};
@@ -8099,15 +6937,13 @@
+ static IR_Container_ptr _duplicate (IR_Container_ptr obj);
+ static IR_Container_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static Container_ptr _nil (void)
@@ -8122,11 +6958,9 @@
- virtual IR::Contained_ptr lookup (
+ virtual IR_Contained_ptr lookup (
const char * search_name,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
+@@ -6096,8 +4710,8 @@
CORBA::SystemException
));
@@ -8135,11 +6969,9 @@
+ virtual IR_ContainedSeq * contents (
+ IR_DefinitionKind limit_type,
CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
+@@ -6106,10 +4720,10 @@
CORBA::SystemException
));
@@ -8150,21 +6982,9 @@
- IR::DefinitionKind limit_type,
+ IR_DefinitionKind limit_type,
CORBA::Boolean exclude_inherited,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -6121,7 +4169,7 @@
-
- struct Description;
- class Description_var;
--
-+
- struct TAO_IFR_Client_Export Description
- {
-
-@@ -6131,8 +4179,8 @@
+@@ -6130,8 +4744,8 @@
static void _tao_any_destructor (void*);
@@ -8175,155 +6995,49 @@
CORBA::Any value;
};
-@@ -6143,18 +4191,18 @@
- 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);
-@@ -6176,7 +4224,7 @@
- operator Description *&();
- Description *&ptr (void);
- Description *operator-> (void);
--
-+
- private:
- Description *&ptr_;
- // assignment from T_var not allowed
-@@ -6187,17 +4235,14 @@
-
+@@ -6187,9 +4801,6 @@
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
+
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CH_
-
+-
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,
-@@ -6214,7 +4259,7 @@
- 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,
-@@ -6223,35 +4268,28 @@
+@@ -6222,15 +4833,8 @@
CORBA::Boolean release);
};
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
--
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_CONTAINER_DESCRIPTIONSEQ_CH_)
-#define _IR_CONTAINER_DESCRIPTIONSEQ_CH_
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
- class DescriptionSeq;
class DescriptionSeq_var;
--
-+
- // *************************************************************
- // DescriptionSeq
+
// *************************************************************
--
-- class TAO_IFR_Client_Export DescriptionSeq : public
-+
-+ class TAO_IFR_Client_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::ULong max,
-+ CORBA::ULong length,
-+ Description *buffer,
- CORBA::Boolean release = 0
- );
- DescriptionSeq (const DescriptionSeq &); // copy ctor
-@@ -6263,15 +4301,9 @@
- #endif /* ! __GNUC__ || g++ >= 2.8 */
+@@ -6263,14 +4867,8 @@
};
--
+
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_CONTAINER_DESCRIPTIONSEQ___VAR_CH_)
-#define _IR_CONTAINER_DESCRIPTIONSEQ___VAR_CH_
-
+-
// *************************************************************
- // class IR::Container::DescriptionSeq_var
+ // class IR_Container::DescriptionSeq_var
// *************************************************************
class TAO_IFR_Client_Export DescriptionSeq_var
-@@ -6281,21 +4313,20 @@
- 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
-+ // in, inout, out, _retn
- const DescriptionSeq &in (void) const;
- DescriptionSeq &inout (void);
- DescriptionSeq *&out (void);
-@@ -6306,13 +4337,6 @@
+@@ -6305,13 +4903,6 @@
DescriptionSeq *ptr_;
};
@@ -8337,15 +7051,7 @@
class TAO_IFR_Client_Export DescriptionSeq_out
{
public:
-@@ -6325,163 +4349,160 @@
- DescriptionSeq *&ptr (void);
- DescriptionSeq *operator-> (void);
- Description & operator[] (CORBA::ULong index);
--
-+
- private:
- DescriptionSeq *&ptr_;
- // assignment from T_var not allowed
+@@ -6331,13 +4922,10 @@
void operator= (const DescriptionSeq_var &);
};
@@ -8360,11 +7066,8 @@
+ IR_DefinitionKind limit_type,
CORBA::Boolean exclude_inherited,
CORBA::Long max_returned_objs,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -6347,7 +4935,7 @@
CORBA::SystemException
));
@@ -8373,11 +7076,7 @@
const char * id,
const char * name,
const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
+@@ -6358,11 +4946,11 @@
CORBA::SystemException
));
@@ -8389,11 +7088,9 @@
- IR::IDLType_ptr type,
+ IR_IDLType_ptr type,
const CORBA::Any & value,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
+@@ -6371,11 +4959,11 @@
CORBA::SystemException
));
@@ -8403,12 +7100,11 @@
const char * name,
const char * version,
- const IR::StructMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV =
+ const IR_StructMemberSeq & members,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -6383,12 +4971,12 @@
CORBA::SystemException
));
@@ -8419,13 +7115,12 @@
const char * version,
- IR::IDLType_ptr discriminator_type,
- const IR::UnionMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_IDLType_ptr discriminator_type,
+ const IR_UnionMemberSeq & members,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -6396,11 +4984,11 @@
CORBA::SystemException
));
@@ -8435,12 +7130,11 @@
const char * name,
const char * version,
- const IR::EnumMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV =
+ const IR_EnumMemberSeq & members,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -6408,11 +4996,11 @@
CORBA::SystemException
));
@@ -8450,12 +7144,11 @@
const char * name,
const char * version,
- IR::IDLType_ptr original_type,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_IDLType_ptr original_type,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -6420,11 +5008,11 @@
CORBA::SystemException
));
@@ -8468,11 +7161,8 @@
+ const IR_InterfaceDefSeq & base_interfaces,
CORBA::Boolean is_abstract,
CORBA::Boolean is_local,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -6434,17 +5022,17 @@
CORBA::SystemException
));
@@ -8489,14 +7179,13 @@
- const IR::ValueDefSeq & abstract_base_values,
- const IR::InterfaceDefSeq & supported_interfaces,
- const IR::InitializerSeq & initializers,
-- CORBA::Environment &ACE_TRY_ENV =
+ const IR_ValueDefSeq & abstract_base_values,
+ const IR_InterfaceDefSeq & supported_interfaces,
+ const IR_InitializerSeq & initializers,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -6452,11 +5040,11 @@
CORBA::SystemException
));
@@ -8506,12 +7195,11 @@
const char * name,
const char * version,
- IR::IDLType_ptr original_type_def,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_IDLType_ptr original_type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -6464,11 +5052,11 @@
CORBA::SystemException
));
@@ -8521,12 +7209,11 @@
const char * name,
const char * version,
- const IR::StructMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV =
+ const IR_StructMemberSeq & members,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -6476,7 +5064,7 @@
CORBA::SystemException
));
@@ -8535,849 +7222,497 @@
const char * id,
const char * name,
const char * version,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -6489,801 +4510,39 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -6500,14 +5088,14 @@
_TAO_Container_Proxy_Broker *the_TAO_Container_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- Container (
-- TAO_Stub *objref,
+ 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 IR_Container_setup_collocation (int collocated);
+
+- Container (
+ IR_Container (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -6517,10 +5105,10 @@
+ friend class _TAO_Container_ThruPOA_Proxy_Impl;
+ friend class _TAO_Container_Direct_Proxy_Impl;
+
- virtual ~Container (void);
--private:
++ virtual ~IR_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:
++ IR_Container (const IR_Container &);
++ void operator= (const IR_Container &);
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -6530,7 +5118,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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_;
++ friend class IR_Container;
+
+ friend class _TAO_Container_Remote_Proxy_Impl;
+ friend class _TAO_Container_ThruPOA_Proxy_Impl;
+@@ -6566,15 +5154,15 @@
+ 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
++ void result (IR_Contained_ptr result);
+ // update the result
- IR::Contained_ptr _result;
--};
--
--class TAO_ClientRequestInfo_IR_Container_contents : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_Container;
+
+ friend class _TAO_Container_Remote_Proxy_Impl;
+ friend class _TAO_Container_ThruPOA_Proxy_Impl;
+@@ -6583,7 +5171,7 @@
+ TAO_ClientRequestInfo_IR_Container_contents (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- 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_contents (const TAO_ClientRequestInfo_IR_Container_contents &);
-- void operator= (const TAO_ClientRequestInfo_IR_Container_contents &);
++ IR_DefinitionKind & limit_type,
+ const CORBA::Boolean & exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -6610,17 +5198,17 @@
+ 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_;
++ const IR_DefinitionKind & limit_type_;
+ const CORBA::Boolean & exclude_inherited_;
- void result (IR::ContainedSeq * result);
-- // update the result
++ void result (IR_ContainedSeq * result);
+ // update the result
- IR::ContainedSeq * _result;
--};
--
--class TAO_ClientRequestInfo_IR_Container_lookup_name : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * search_name,
-- const CORBA::Long & levels_to_search,
++ friend class IR_Container;
+
+ friend class _TAO_Container_Remote_Proxy_Impl;
+ friend class _TAO_Container_ThruPOA_Proxy_Impl;
+@@ -6631,7 +5219,7 @@
+ CORBA::Object_ptr _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_;
++ IR_DefinitionKind & limit_type,
+ const CORBA::Boolean & exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -6660,17 +5248,17 @@
+ 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_;
++ const IR_DefinitionKind & limit_type_;
+ const CORBA::Boolean & exclude_inherited_;
- void result (IR::ContainedSeq * result);
-- // update the result
++ void result (IR_ContainedSeq * result);
+ // update the result
- IR::ContainedSeq * _result;
--};
--
--class TAO_ClientRequestInfo_IR_Container_describe_contents : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_Container;
+
+ friend class _TAO_Container_Remote_Proxy_Impl;
+ friend class _TAO_Container_ThruPOA_Proxy_Impl;
+@@ -6679,7 +5267,7 @@
+ TAO_ClientRequestInfo_IR_Container_describe_contents (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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 &);
++ IR_DefinitionKind & limit_type,
+ const CORBA::Boolean & exclude_inherited,
+ const CORBA::Long & max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -6707,18 +5295,18 @@
+ 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_;
++ 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
++ 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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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_;
++ friend class IR_Container;
+
+ friend class _TAO_Container_Remote_Proxy_Impl;
+ friend class _TAO_Container_ThruPOA_Proxy_Impl;
+@@ -6758,15 +5346,15 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
- void result (IR::ModuleDef_ptr result);
-- // update the result
++ void result (IR_ModuleDef_ptr result);
+ // update the result
- IR::ModuleDef_ptr _result;
--};
--
--class TAO_ClientRequestInfo_IR_Container_create_constant : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++ friend class IR_Container;
+
+ friend class _TAO_Container_Remote_Proxy_Impl;
+ friend class _TAO_Container_ThruPOA_Proxy_Impl;
+@@ -6778,7 +5366,7 @@
+ 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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -6808,17 +5396,17 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
- IR::IDLType_ptr type_;
-- const CORBA::Any & value_;
++ IR_IDLType_ptr type_;
+ const CORBA::Any & value_;
- void result (IR::ConstantDef_ptr result);
-- // update the result
++ void result (IR_ConstantDef_ptr result);
+ // update the result
- IR::ConstantDef_ptr _result;
--};
--
--class TAO_ClientRequestInfo_IR_Container_create_struct : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++ friend class IR_Container;
+
+ friend class _TAO_Container_Remote_Proxy_Impl;
+ friend class _TAO_Container_ThruPOA_Proxy_Impl;
+@@ -6830,7 +5418,7 @@
+ 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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -6859,16 +5447,16 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
- const IR::StructMemberSeq & members_;
- void result (IR::StructDef_ptr result);
-- // update the result
++ 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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++ friend class IR_Container;
+
+ friend class _TAO_Container_Remote_Proxy_Impl;
+ friend class _TAO_Container_ThruPOA_Proxy_Impl;
+@@ -6880,8 +5468,8 @@
+ 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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -6910,17 +5498,17 @@
+ 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_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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++ friend class IR_Container;
+
+ friend class _TAO_Container_Remote_Proxy_Impl;
+ friend class _TAO_Container_ThruPOA_Proxy_Impl;
+@@ -6932,7 +5520,7 @@
+ 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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -6961,16 +5549,16 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
- const IR::EnumMemberSeq & members_;
- void result (IR::EnumDef_ptr result);
-- // update the result
++ 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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++ friend class IR_Container;
+
+ friend class _TAO_Container_Remote_Proxy_Impl;
+ friend class _TAO_Container_ThruPOA_Proxy_Impl;
+@@ -6982,7 +5570,7 @@
+ 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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -7011,16 +5599,16 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
- IR::IDLType_ptr original_type_;
- void result (IR::AliasDef_ptr result);
-- // update the result
++ 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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++ friend class IR_Container;
+
+ friend class _TAO_Container_Remote_Proxy_Impl;
+ friend class _TAO_Container_ThruPOA_Proxy_Impl;
+@@ -7032,7 +5620,7 @@
+ 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,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -7063,18 +5651,18 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
- const IR::InterfaceDefSeq & base_interfaces_;
-- const CORBA::Boolean & is_abstract_;
-- const CORBA::Boolean & is_local_;
++ const IR_InterfaceDefSeq & base_interfaces_;
+ const CORBA::Boolean & is_abstract_;
+ const CORBA::Boolean & is_local_;
- void result (IR::InterfaceDef_ptr result);
-- // update the result
++ void result (IR_InterfaceDef_ptr result);
+ // update the result
- IR::InterfaceDef_ptr _result;
--};
--
--class TAO_ClientRequestInfo_IR_Container_create_value : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
-- const CORBA::Boolean & is_custom,
-- const CORBA::Boolean & is_abstract,
++ friend class IR_Container;
+
+ friend class _TAO_Container_Remote_Proxy_Impl;
+ friend class _TAO_Container_ThruPOA_Proxy_Impl;
+@@ -7088,11 +5676,11 @@
+ const char * version,
+ const CORBA::Boolean & is_custom,
+ const CORBA::Boolean & is_abstract,
- IR::ValueDef_ptr base_value,
-- const CORBA::Boolean & is_truncatable,
++ 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_;
++ const IR_ValueDefSeq & abstract_base_values,
++ const IR_InterfaceDefSeq & supported_interfaces,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -7123,20 +5711,20 @@
+ const char * version_;
+ const CORBA::Boolean & is_custom_;
+ const CORBA::Boolean & is_abstract_;
- IR::ValueDef_ptr base_value_;
-- const CORBA::Boolean & is_truncatable_;
++ 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
++ 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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++ friend class IR_Container;
+
+ friend class _TAO_Container_Remote_Proxy_Impl;
+ friend class _TAO_Container_ThruPOA_Proxy_Impl;
+@@ -7148,7 +5736,7 @@
+ 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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -7177,16 +5765,16 @@
+ 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_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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++ friend class IR_Container;
+
+ friend class _TAO_Container_Remote_Proxy_Impl;
+ friend class _TAO_Container_ThruPOA_Proxy_Impl;
+@@ -7198,7 +5786,7 @@
+ 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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -7227,16 +5815,16 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
- const IR::StructMemberSeq & members_;
- void result (IR::ExceptionDef_ptr result);
-- // update the result
++ const IR_StructMemberSeq & members_;
++ void result (IR_ExceptionDef_ptr result);
+ // update the result
- IR::ExceptionDef_ptr _result;
--};
++ IR_ExceptionDef_ptr _result;
+ };
--class TAO_ClientRequestInfo_IR_Container_create_native : public TAO_ClientRequestInfo
--{
--public:
+ class TAO_ClientRequestInfo_IR_Container_create_native : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::Container;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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_;
+@@ -7276,9 +5864,9 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
- void result (IR::NativeDef_ptr result);
-- // update the result
++ void result (IR_NativeDef_ptr result);
+ // update the result
- IR::NativeDef_ptr _result;
--};
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-+ virtual ~IR_Container (void);
-+private:
-+ IR_Container (const IR_Container &);
-+ void operator= (const IR_Container &);
++ IR_NativeDef_ptr _result;
};
-
-@@ -7296,13 +4555,13 @@
- // Base Impl. Declaration
+ #endif /* TAO_HAS_INTERCEPTORS */
+@@ -7296,12 +5884,12 @@
//
--class TAO_IFR_Client_Export _TAO_Container_Proxy_Impl :
+ class TAO_IFR_Client_Export _TAO_Container_Proxy_Impl :
- public virtual CORBA::_TAO_IRObject_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_Container_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
-@@ -7311,9 +4570,9 @@
+@@ -7310,9 +5898,9 @@
CORBA::SystemException
)) = 0;
@@ -9389,7 +7724,7 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -7321,11 +4580,11 @@
+@@ -7320,11 +5908,11 @@
CORBA::SystemException
)) = 0;
@@ -9403,7 +7738,7 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -7333,9 +4592,9 @@
+@@ -7332,9 +5920,9 @@
CORBA::SystemException
)) = 0;
@@ -9415,7 +7750,7 @@
CORBA::Boolean exclude_inherited,
CORBA::Long max_returned_objs,
CORBA::Environment &ACE_TRY_ENV
-@@ -7344,7 +4603,7 @@
+@@ -7343,7 +5931,7 @@
CORBA::SystemException
)) = 0;
@@ -9424,7 +7759,7 @@
CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
-@@ -7355,12 +4614,12 @@
+@@ -7354,12 +5942,12 @@
CORBA::SystemException
)) = 0;
@@ -9439,7 +7774,7 @@
const CORBA::Any & value,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -7368,61 +4627,61 @@
+@@ -7367,61 +5955,61 @@
CORBA::SystemException
)) = 0;
@@ -9512,7 +7847,7 @@
CORBA::Boolean is_abstract,
CORBA::Boolean is_local,
CORBA::Environment &ACE_TRY_ENV
-@@ -7431,49 +4690,49 @@
+@@ -7430,49 +6018,49 @@
CORBA::SystemException
)) = 0;
@@ -9572,7 +7907,7 @@
CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
-@@ -7488,6 +4747,7 @@
+@@ -7487,6 +6075,7 @@
_TAO_Container_Proxy_Impl (void);
};
@@ -9580,32 +7915,25 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -7497,18 +4757,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_Container_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_Container_Remote_Proxy_Impl :
+@@ -7499,7 +6088,7 @@
+ class TAO_IFR_Client_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:
- _TAO_Container_Remote_Proxy_Impl (void);
--
-+
+@@ -7507,7 +6096,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
-@@ -7517,9 +4777,9 @@
+@@ -7516,9 +6105,9 @@
CORBA::SystemException
));
@@ -9617,7 +7945,7 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -7527,11 +4787,11 @@
+@@ -7526,11 +6115,11 @@
CORBA::SystemException
));
@@ -9631,7 +7959,7 @@
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -7539,9 +4799,9 @@
+@@ -7538,9 +6127,9 @@
CORBA::SystemException
));
@@ -9643,7 +7971,7 @@
CORBA::Boolean exclude_inherited,
CORBA::Long max_returned_objs,
CORBA::Environment &ACE_TRY_ENV
-@@ -7550,7 +4810,7 @@
+@@ -7549,7 +6138,7 @@
CORBA::SystemException
));
@@ -9652,7 +7980,7 @@
CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
-@@ -7561,12 +4821,12 @@
+@@ -7560,12 +6149,12 @@
CORBA::SystemException
));
@@ -9667,7 +7995,7 @@
const CORBA::Any & value,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -7574,61 +4834,61 @@
+@@ -7573,61 +6162,61 @@
CORBA::SystemException
));
@@ -9740,7 +8068,7 @@
CORBA::Boolean is_abstract,
CORBA::Boolean is_local,
CORBA::Environment &ACE_TRY_ENV
-@@ -7637,49 +4897,49 @@
+@@ -7636,49 +6225,49 @@
CORBA::SystemException
));
@@ -9800,7 +8128,7 @@
CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
-@@ -7689,7 +4949,6 @@
+@@ -7688,7 +6277,6 @@
ACE_THROW_SPEC ((
CORBA::SystemException
));
@@ -9808,24 +8136,7 @@
};
//
-@@ -7698,49 +4957,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_Container_Proxy_Broker
+@@ -7711,8 +6299,9 @@
{
public:
virtual ~_TAO_Container_Proxy_Broker (void);
@@ -9836,48 +8147,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_Container_Proxy_Broker (void);
--
-+
+@@ -7721,6 +6310,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_Container_Remote_Proxy_Broker : public virtual _TAO_Container_Proxy_Broker
- {
--public:
-+public:
- _TAO_Container_Remote_Proxy_Broker (void);
--
-+
+@@ -7738,7 +6328,7 @@
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 ()
);
-@@ -7754,123 +5014,45 @@
+@@ -7752,117 +6342,39 @@
static _TAO_Container_Remote_Proxy_Broker *the_TAO_Container_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -9964,7 +8257,7 @@
class _TAO_IDLType_Remote_Proxy_Broker;
-class TAO_IFR_Client_Export IDLType: public virtual CORBA::IRObject
-+class TAO_IFR_Client_Export IR_IDLType: public virtual CORBA_IRObject
++class TAO_IFR_Client_Export IR_IDLType : public virtual CORBA_IRObject
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -9980,15 +8273,13 @@
+ static IR_IDLType_ptr _duplicate (IR_IDLType_ptr obj);
+ static IR_IDLType_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static IDLType_ptr _nil (void)
@@ -9999,146 +8290,56 @@
}
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 ((
-@@ -7878,89 +5060,39 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -7888,14 +6400,14 @@
_TAO_IDLType_Proxy_Broker *the_TAO_IDLType_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- IDLType (
-- TAO_Stub *objref,
+ 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 IR_IDLType_setup_collocation (int collocated);
+
+- IDLType (
+ IR_IDLType (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -7905,10 +6417,10 @@
+ friend class _TAO_IDLType_ThruPOA_Proxy_Impl;
+ friend class _TAO_IDLType_Direct_Proxy_Impl;
+
- virtual ~IDLType (void);
--private:
++ virtual ~IR_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
--};
-
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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 &);
- };
-
-@@ -7973,15 +5105,15 @@
- // Base Impl. Declaration
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -7918,7 +6430,7 @@
+ class TAO_ClientRequestInfo_IR_IDLType_type_get : public TAO_ClientRequestInfo
+ {
+ public:
+- friend class IR::IDLType;
++ friend class IR_IDLType;
+
+ friend class _TAO_IDLType_Remote_Proxy_Impl;
+ friend class _TAO_IDLType_ThruPOA_Proxy_Impl;
+@@ -7972,7 +6484,7 @@
//
--class TAO_IFR_Client_Export _TAO_IDLType_Proxy_Impl :
+ class TAO_IFR_Client_Export _TAO_IDLType_Proxy_Impl :
- public virtual CORBA::_TAO_IRObject_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_IDLType_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
-@@ -7991,6 +5123,7 @@
+@@ -7989,6 +6501,7 @@
_TAO_IDLType_Proxy_Impl (void);
};
@@ -10146,52 +8347,16 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -8000,20 +5133,20 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_IDLType_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_IDLType_Remote_Proxy_Impl :
+@@ -8001,7 +6514,7 @@
+ class TAO_IFR_Client_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:
- _TAO_IDLType_Remote_Proxy_Impl (void);
--
-+
- 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
-@@ -8027,49 +5160,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_IDLType_Proxy_Broker
+@@ -8039,8 +6552,9 @@
{
public:
virtual ~_TAO_IDLType_Proxy_Broker (void);
@@ -10202,50 +8367,35 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_IDLType_Proxy_Broker (void);
--
-+
+@@ -8049,6 +6563,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_IDLType_Remote_Proxy_Broker : public virtual _TAO_IDLType_Proxy_Broker
- {
--public:
-+public:
- _TAO_IDLType_Remote_Proxy_Broker (void);
--
-+
+@@ -8066,7 +6581,7 @@
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 ()
);
-@@ -8083,560 +5217,317 @@
+@@ -8080,558 +6595,315 @@
static _TAO_IDLType_Remote_Proxy_Broker *the_TAO_IDLType_Remote_Proxy_Broker (void);
};
--
- //
--// End Remote Proxy Broker Declaration
++//
+// End Remote Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
++///////////////////////////////////////////////////////////////////////
+-//
+-// End Remote Proxy Broker Declaration
+-///////////////////////////////////////////////////////////////////////
+-
-
-#endif /* end #if !defined */
-
@@ -10265,9 +8415,8 @@
-#define _IR_PRIMITIVEDEF___VAR_CH_
-
-class TAO_IFR_Client_Export PrimitiveDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_PrimitiveDef_var : public TAO_Base_var
- {
- public:
+-{
+-public:
- PrimitiveDef_var (void); // default constructor
- PrimitiveDef_var (PrimitiveDef_ptr p) : ptr_ (p) {}
- PrimitiveDef_var (const PrimitiveDef_var &); // copy constructor
@@ -10295,26 +8444,11 @@
-
-
-#endif /* end #if !defined */
-+ 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
-
-+ IR_PrimitiveDef_var &operator= (IR_PrimitiveDef_ptr);
-+ IR_PrimitiveDef_var &operator= (const IR_PrimitiveDef_var &);
-+ IR_PrimitiveDef_ptr operator-> (void) const;
-
+-
+-
-#if !defined (_IR_PRIMITIVEDEF___OUT_CH_)
-#define _IR_PRIMITIVEDEF___OUT_CH_
-+ operator const IR_PrimitiveDef_ptr &() const;
-+ operator IR_PrimitiveDef_ptr &();
-+ // in, inout, out, _retn
-+ 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;
-
+-
-class TAO_IFR_Client_Export PrimitiveDef_out
-{
-public:
@@ -10328,15 +8462,11 @@
- PrimitiveDef_ptr &ptr (void);
- PrimitiveDef_ptr operator-> (void);
-
- private:
+-private:
- PrimitiveDef_ptr &ptr_;
-+ IR_PrimitiveDef_ptr ptr_;
-+ // Unimplemented - prevents widening assignment.
-+ IR_PrimitiveDef_var (const TAO_Base_var &rhs);
-+ IR_PrimitiveDef_var &operator= (const TAO_Base_var &rhs);
- };
-
-
+-};
+-
+-
-#endif /* end #if !defined */
-
-class StringDef;
@@ -10353,9 +8483,8 @@
-#define _IR_STRINGDEF___VAR_CH_
-
-class TAO_IFR_Client_Export StringDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_PrimitiveDef_out
- {
- public:
+-{
+-public:
- StringDef_var (void); // default constructor
- StringDef_var (StringDef_ptr p) : ptr_ (p) {}
- StringDef_var (const StringDef_var &); // copy constructor
@@ -10373,24 +8502,14 @@
- StringDef_ptr &out (void);
- StringDef_ptr _retn (void);
- StringDef_ptr ptr (void) const;
-+ 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:
+-
+-private:
- StringDef_ptr ptr_;
- // Unimplemented - prevents widening assignment.
- StringDef_var (const TAO_Base_var &rhs);
- StringDef_var &operator= (const TAO_Base_var &rhs);
-+ IR_PrimitiveDef_ptr &ptr_;
- };
-
+-};
+-
-
-#endif /* end #if !defined */
-
@@ -10399,9 +8518,8 @@
-#define _IR_STRINGDEF___OUT_CH_
-
-class TAO_IFR_Client_Export StringDef_out
-+class TAO_IFR_Client_Export IR_StringDef_var : public TAO_Base_var
- {
- public:
+-{
+-public:
- StringDef_out (StringDef_ptr &);
- StringDef_out (StringDef_var &);
- StringDef_out (const StringDef_out &);
@@ -10420,17 +8538,10 @@
-#endif /* end #if !defined */
-
-class SequenceDef;
-+ 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
-
+-
-#if !defined (_IR_SEQUENCEDEF___PTR_CH_)
-#define _IR_SEQUENCEDEF___PTR_CH_
-+ IR_StringDef_var &operator= (IR_StringDef_ptr);
-+ IR_StringDef_var &operator= (const IR_StringDef_var &);
-+ IR_StringDef_ptr operator-> (void) const;
-
+-
-typedef SequenceDef *SequenceDef_ptr;
-
-#endif /* end #if !defined */
@@ -10459,25 +8570,14 @@
- SequenceDef_ptr &out (void);
- SequenceDef_ptr _retn (void);
- SequenceDef_ptr ptr (void) const;
-+ operator const IR_StringDef_ptr &() const;
-+ operator IR_StringDef_ptr &();
-+ // in, inout, out, _retn
-+ 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:
+-
+-private:
- SequenceDef_ptr ptr_;
-+ IR_StringDef_ptr ptr_;
- // Unimplemented - prevents widening assignment.
+- // Unimplemented - prevents widening assignment.
- SequenceDef_var (const TAO_Base_var &rhs);
- SequenceDef_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 */
-
@@ -10486,9 +8586,8 @@
-#define _IR_SEQUENCEDEF___OUT_CH_
-
-class TAO_IFR_Client_Export SequenceDef_out
-+class TAO_IFR_Client_Export IR_StringDef_out
- {
- public:
+-{
+-public:
- SequenceDef_out (SequenceDef_ptr &);
- SequenceDef_out (SequenceDef_var &);
- SequenceDef_out (const SequenceDef_out &);
@@ -10499,21 +8598,10 @@
- SequenceDef_ptr &ptr (void);
- SequenceDef_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:
+-private:
- SequenceDef_ptr &ptr_;
-+ IR_StringDef_ptr &ptr_;
- };
-
+-};
+-
-
-#endif /* end #if !defined */
-
@@ -10531,55 +8619,52 @@
-#define _IR_ARRAYDEF___VAR_CH_
-
-class TAO_IFR_Client_Export ArrayDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_SequenceDef_var : public TAO_Base_var
++class TAO_IFR_Client_Export IR_PrimitiveDef_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_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
+
- ArrayDef_var &operator= (ArrayDef_ptr);
- ArrayDef_var &operator= (const ArrayDef_var &);
- ArrayDef_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 ArrayDef_ptr &() const;
- operator ArrayDef_ptr &();
-- // in, inout, out, _retn
++ operator const IR_PrimitiveDef_ptr &() const;
++ operator IR_PrimitiveDef_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_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
-+
-+ 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
-+ 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;
++ 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:
- ArrayDef_ptr ptr_;
-+ IR_SequenceDef_ptr ptr_;
++ IR_PrimitiveDef_ptr ptr_;
// Unimplemented - prevents widening assignment.
- ArrayDef_var (const TAO_Base_var &rhs);
- ArrayDef_var &operator= (const TAO_Base_var &rhs);
-+ IR_SequenceDef_var (const TAO_Base_var &rhs);
-+ IR_SequenceDef_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 */
-
-
@@ -10587,7 +8672,7 @@
-#define _IR_ARRAYDEF___OUT_CH_
-
-class TAO_IFR_Client_Export ArrayDef_out
-+class TAO_IFR_Client_Export IR_SequenceDef_out
++class TAO_IFR_Client_Export IR_PrimitiveDef_out
{
public:
- ArrayDef_out (ArrayDef_ptr &);
@@ -10599,20 +8684,19 @@
- operator ArrayDef_ptr &();
- ArrayDef_ptr &ptr (void);
- ArrayDef_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);
-+
++ 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:
- ArrayDef_ptr &ptr_;
-+ IR_SequenceDef_ptr &ptr_;
++ IR_PrimitiveDef_ptr &ptr_;
};
-
@@ -10632,52 +8716,49 @@
-#define _IR_WSTRINGDEF___VAR_CH_
-
-class TAO_IFR_Client_Export WstringDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_ArrayDef_var : public TAO_Base_var
++class TAO_IFR_Client_Export IR_StringDef_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_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
+
- WstringDef_var &operator= (WstringDef_ptr);
- WstringDef_var &operator= (const WstringDef_var &);
- WstringDef_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 WstringDef_ptr &() const;
- operator WstringDef_ptr &();
-- // in, inout, out, _retn
++ operator const IR_StringDef_ptr &() const;
++ operator IR_StringDef_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_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
-+
-+ 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
-+ 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;
++ 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:
- WstringDef_ptr ptr_;
-+ IR_ArrayDef_ptr ptr_;
++ IR_StringDef_ptr ptr_;
// Unimplemented - prevents widening assignment.
- WstringDef_var (const TAO_Base_var &rhs);
- WstringDef_var &operator= (const TAO_Base_var &rhs);
-+ IR_ArrayDef_var (const TAO_Base_var &rhs);
-+ IR_ArrayDef_var &operator= (const TAO_Base_var &rhs);
++ IR_StringDef_var (const TAO_Base_var &rhs);
++ IR_StringDef_var &operator= (const TAO_Base_var &rhs);
};
-
@@ -10688,7 +8769,7 @@
-#define _IR_WSTRINGDEF___OUT_CH_
-
-class TAO_IFR_Client_Export WstringDef_out
-+class TAO_IFR_Client_Export IR_ArrayDef_out
++class TAO_IFR_Client_Export IR_StringDef_out
{
public:
- WstringDef_out (WstringDef_ptr &);
@@ -10700,85 +8781,120 @@
- operator WstringDef_ptr &();
- WstringDef_ptr &ptr (void);
- WstringDef_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);
-+
++ 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:
- WstringDef_ptr &ptr_;
-+ IR_ArrayDef_ptr &ptr_;
++ IR_StringDef_ptr &ptr_;
};
--
++class TAO_IFR_Client_Export IR_SequenceDef_var : public TAO_Base_var
++{
++public:
++ 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
+
-#endif /* end #if !defined */
-
-class FixedDef;
-
-#if !defined (_IR_FIXEDDEF___PTR_CH_)
-#define _IR_FIXEDDEF___PTR_CH_
--
++ IR_SequenceDef_var &operator= (IR_SequenceDef_ptr);
++ IR_SequenceDef_var &operator= (const IR_SequenceDef_var &);
++ IR_SequenceDef_ptr operator-> (void) const;
+
-typedef FixedDef *FixedDef_ptr;
--
++ operator const IR_SequenceDef_ptr &() const;
++ operator IR_SequenceDef_ptr &();
++ // in, inout, out, _retn
++ 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;
+
-#endif /* end #if !defined */
--
--
++private:
++ IR_SequenceDef_ptr ptr_;
++ // Unimplemented - prevents widening assignment.
++ IR_SequenceDef_var (const TAO_Base_var &rhs);
++ IR_SequenceDef_var &operator= (const TAO_Base_var &rhs);
++};
+
++class TAO_IFR_Client_Export IR_SequenceDef_out
++{
++public:
++ 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);
+
-#if !defined (_IR_FIXEDDEF___VAR_CH_)
-#define _IR_FIXEDDEF___VAR_CH_
--
++private:
++ IR_SequenceDef_ptr &ptr_;
++};
+
-class TAO_IFR_Client_Export FixedDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_WstringDef_var : public TAO_Base_var
++class TAO_IFR_Client_Export IR_ArrayDef_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_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
+
- FixedDef_var &operator= (FixedDef_ptr);
- FixedDef_var &operator= (const FixedDef_var &);
- FixedDef_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 FixedDef_ptr &() const;
- operator FixedDef_ptr &();
-- // in, inout, out, _retn
++ operator const IR_ArrayDef_ptr &() const;
++ operator IR_ArrayDef_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_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
-+
-+ 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
-+ 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;
++ 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:
- FixedDef_ptr ptr_;
-+ IR_WstringDef_ptr ptr_;
++ IR_ArrayDef_ptr ptr_;
// Unimplemented - prevents widening assignment.
- FixedDef_var (const TAO_Base_var &rhs);
- FixedDef_var &operator= (const TAO_Base_var &rhs);
-+ IR_WstringDef_var (const TAO_Base_var &rhs);
-+ IR_WstringDef_var &operator= (const TAO_Base_var &rhs);
++ IR_ArrayDef_var (const TAO_Base_var &rhs);
++ IR_ArrayDef_var &operator= (const TAO_Base_var &rhs);
};
-
@@ -10789,7 +8905,7 @@
-#define _IR_FIXEDDEF___OUT_CH_
-
-class TAO_IFR_Client_Export FixedDef_out
-+class TAO_IFR_Client_Export IR_WstringDef_out
++class TAO_IFR_Client_Export IR_ArrayDef_out
{
public:
- FixedDef_out (FixedDef_ptr &);
@@ -10801,27 +8917,26 @@
- operator FixedDef_ptr &();
- FixedDef_ptr &ptr (void);
- FixedDef_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);
-+
++ 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:
- FixedDef_ptr &ptr_;
-+ IR_WstringDef_ptr &ptr_;
++ IR_ArrayDef_ptr &ptr_;
};
-
-#endif /* end #if !defined */
-
-enum PrimitiveKind
-+class TAO_IFR_Client_Export IR_FixedDef_var : public TAO_Base_var
++class TAO_IFR_Client_Export IR_WstringDef_var : public TAO_Base_var
{
- pk_null,
- pk_void,
@@ -10849,50 +8964,86 @@
-typedef PrimitiveKind &PrimitiveKind_out;
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimitiveKind;
-
--
++public:
++ 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
+
-#if !defined (_IR_REPOSITORY___PTR_CH_)
-#define _IR_REPOSITORY___PTR_CH_
--
++ IR_WstringDef_var &operator= (IR_WstringDef_ptr);
++ IR_WstringDef_var &operator= (const IR_WstringDef_var &);
++ IR_WstringDef_ptr operator-> (void) const;
+
-class Repository;
-typedef Repository *Repository_ptr;
--
++ operator const IR_WstringDef_ptr &() const;
++ operator IR_WstringDef_ptr &();
++ // in, inout, out, _retn
++ 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;
+
-#endif /* end #if !defined */
--
++private:
++ IR_WstringDef_ptr ptr_;
++ // Unimplemented - prevents widening assignment.
++ IR_WstringDef_var (const TAO_Base_var &rhs);
++ IR_WstringDef_var &operator= (const TAO_Base_var &rhs);
++};
+
++class TAO_IFR_Client_Export IR_WstringDef_out
++{
+public:
-+ 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
++ 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);
-#if !defined (_IR_REPOSITORY___VAR_CH_)
-#define _IR_REPOSITORY___VAR_CH_
-+ IR_FixedDef_var &operator= (IR_FixedDef_ptr);
-+ IR_FixedDef_var &operator= (const IR_FixedDef_var &);
-+ IR_FixedDef_ptr operator-> (void) const;
++private:
++ IR_WstringDef_ptr &ptr_;
++};
-class TAO_IFR_Client_Export Repository_var : public TAO_Base_var
--{
--public:
++class TAO_IFR_Client_Export IR_FixedDef_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
--
++ 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
+
- Repository_var &operator= (Repository_ptr);
- Repository_var &operator= (const Repository_var &);
- Repository_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 Repository_ptr &() const;
- operator Repository_ptr &();
-- // in, inout, out, _retn
++ operator const IR_FixedDef_ptr &() const;
++ operator IR_FixedDef_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;
-+ operator const IR_FixedDef_ptr &() const;
-+ operator IR_FixedDef_ptr &();
-+ // in, inout, out, _retn
+ IR_FixedDef_ptr in (void) const;
+ IR_FixedDef_ptr &inout (void);
+ IR_FixedDef_ptr &out (void);
@@ -10929,7 +9080,6 @@
- operator Repository_ptr &();
- Repository_ptr &ptr (void);
- Repository_ptr operator-> (void);
--
+ IR_FixedDef_out (IR_FixedDef_ptr &);
+ IR_FixedDef_out (IR_FixedDef_var &);
+ IR_FixedDef_out (const IR_FixedDef_out &);
@@ -10939,7 +9089,7 @@
+ operator IR_FixedDef_ptr &();
+ IR_FixedDef_ptr &ptr (void);
+ IR_FixedDef_ptr operator-> (void);
-+
+
private:
- Repository_ptr &ptr_;
+ IR_FixedDef_ptr &ptr_;
@@ -10975,15 +9125,13 @@
+ static IR_Repository_ptr _duplicate (IR_Repository_ptr obj);
+ static IR_Repository_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static Repository_ptr _nil (void)
@@ -10998,54 +9146,38 @@
- virtual IR::Contained_ptr lookup_id (
+ 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 ((
-@@ -8645,64 +5536,64 @@
-
- virtual CORBA::TypeCode_ptr get_canonical_typecode (
- CORBA::TypeCode_ptr tc,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
+@@ -8649,8 +6921,8 @@
CORBA::SystemException
));
- virtual IR::PrimitiveDef_ptr get_primitive (
- IR::PrimitiveKind kind,
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_PrimitiveDef_ptr get_primitive (
+ IR_PrimitiveKind kind,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -8658,7 +6930,7 @@
CORBA::SystemException
));
- virtual IR::StringDef_ptr create_string (
+ virtual IR_StringDef_ptr create_string (
CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
+@@ -8667,7 +6939,7 @@
CORBA::SystemException
));
- virtual IR::WstringDef_ptr create_wstring (
+ virtual IR_WstringDef_ptr create_wstring (
CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
+@@ -8676,9 +6948,9 @@
CORBA::SystemException
));
@@ -11053,12 +9185,11 @@
+ virtual IR_SequenceDef_ptr create_sequence (
CORBA::ULong bound,
- IR::IDLType_ptr element_type,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_IDLType_ptr element_type,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -8686,9 +6958,9 @@
CORBA::SystemException
));
@@ -11066,12 +9197,11 @@
+ virtual IR_ArrayDef_ptr create_array (
CORBA::ULong length,
- IR::IDLType_ptr element_type,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_IDLType_ptr element_type,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -8696,7 +6968,7 @@
CORBA::SystemException
));
@@ -11079,492 +9209,234 @@
+ 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 ((
-@@ -8710,451 +5601,85 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -8719,14 +6991,14 @@
_TAO_Repository_Proxy_Broker *the_TAO_Repository_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- Repository (
-- TAO_Stub *objref,
+ 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 IR_Repository_setup_collocation (int collocated);
+
+- Repository (
+ IR_Repository (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -8736,10 +7008,10 @@
+ friend class _TAO_Repository_ThruPOA_Proxy_Impl;
+ friend class _TAO_Repository_Direct_Proxy_Impl;
+
- virtual ~Repository (void);
--private:
++ virtual ~IR_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:
++ IR_Repository (const IR_Repository &);
++ void operator= (const IR_Repository &);
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -8749,7 +7021,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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_;
++ friend class IR_Repository;
+
+ friend class _TAO_Repository_Remote_Proxy_Impl;
+ friend class _TAO_Repository_ThruPOA_Proxy_Impl;
+@@ -8785,15 +7057,15 @@
+ 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
++ void result (IR_Contained_ptr result);
+ // update the result
- IR::Contained_ptr _result;
--};
++ IR_Contained_ptr _result;
+ };
--class TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode : public TAO_ClientRequestInfo
--{
--public:
+ class TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::Repository;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
-+ virtual ~IR_Repository (void);
-+private:
-+ IR_Repository (const IR_Repository &);
-+ void operator= (const IR_Repository &);
- };
-
--class TAO_ClientRequestInfo_IR_Repository_get_primitive : public TAO_ClientRequestInfo
--{
--public:
+@@ -8837,7 +7109,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_Repository;
+
+ friend class _TAO_Repository_Remote_Proxy_Impl;
+ friend class _TAO_Repository_ThruPOA_Proxy_Impl;
+@@ -8846,7 +7118,7 @@
+ TAO_ClientRequestInfo_IR_Repository_get_primitive (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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 &);
++ IR_PrimitiveKind & kind,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -8872,16 +7144,16 @@
+ 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
++ const IR_PrimitiveKind & kind_;
++ void result (IR_PrimitiveDef_ptr result);
+ // update the result
- IR::PrimitiveDef_ptr _result;
--};
-+// The Proxy Implementations are used by each interface to
-+// perform a call. Each different implementation encapsulate
-+// an invocation logics.
++ IR_PrimitiveDef_ptr _result;
+ };
--class TAO_ClientRequestInfo_IR_Repository_create_string : public TAO_ClientRequestInfo
--{
--public:
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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_;
++ friend class IR_Repository;
+
+ friend class _TAO_Repository_Remote_Proxy_Impl;
+ friend class _TAO_Repository_ThruPOA_Proxy_Impl;
+@@ -8917,15 +7189,15 @@
+ 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
++ void result (IR_StringDef_ptr result);
+ // update the result
- IR::StringDef_ptr _result;
--};
-+///////////////////////////////////////////////////////////////////////
-+// Base Impl. Declaration
-+//
++ IR_StringDef_ptr _result;
+ };
--class TAO_ClientRequestInfo_IR_Repository_create_wstring : public TAO_ClientRequestInfo
-+class TAO_IFR_Client_Export _TAO_Repository_Proxy_Impl :
-+ public virtual _TAO_Container_Proxy_Impl
+ 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;
-+ virtual ~_TAO_Repository_Proxy_Impl (void) { }
-
--TAO_ClientRequestInfo_IR_Repository_create_wstring (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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_;
++ friend class IR_Repository;
+
+ friend class _TAO_Repository_Remote_Proxy_Impl;
+ friend class _TAO_Repository_ThruPOA_Proxy_Impl;
+@@ -8961,15 +7233,15 @@
+ 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
++ void result (IR_WstringDef_ptr result);
+ // update the result
- IR::WstringDef_ptr _result;
--};
-+ 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;
-
--class TAO_ClientRequestInfo_IR_Repository_create_sequence : public TAO_ClientRequestInfo
--{
--public:
++ 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;
-+ 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;
-
--TAO_ClientRequestInfo_IR_Repository_create_sequence (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const CORBA::ULong & bound,
++ friend class IR_Repository;
+
+ friend class _TAO_Repository_Remote_Proxy_Impl;
+ friend class _TAO_Repository_ThruPOA_Proxy_Impl;
+@@ -8979,7 +7251,7 @@
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -9006,16 +7278,16 @@
+ 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_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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const CORBA::ULong & length,
++ friend class IR_Repository;
+
+ friend class _TAO_Repository_Remote_Proxy_Impl;
+ friend class _TAO_Repository_ThruPOA_Proxy_Impl;
+@@ -9025,7 +7297,7 @@
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -9052,16 +7324,16 @@
+ 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_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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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_;
++ friend class IR_Repository;
+
+ friend class _TAO_Repository_Remote_Proxy_Impl;
+ friend class _TAO_Repository_ThruPOA_Proxy_Impl;
+@@ -9099,9 +7371,9 @@
+ 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
++ void result (IR_FixedDef_ptr result);
+ // update the result
- IR::FixedDef_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_IFR_Client_Export _TAO_Repository_Proxy_Impl :
++ IR_FixedDef_ptr _result;
+ };
+
+ #endif /* TAO_HAS_INTERCEPTORS */
+@@ -9119,12 +7391,12 @@
+ //
+
+ class TAO_IFR_Client_Export _TAO_Repository_Proxy_Impl :
- public virtual IR::_TAO_Container_Proxy_Impl
--{
--public:
-- virtual ~_TAO_Repository_Proxy_Impl (void) { }
--
++ 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;
--
-- 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;
--
++ virtual IR_Contained_ptr lookup_id (
+ CORBA_Object *_collocated_tao_target_,
+ const char * search_id,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -9142,16 +7414,16 @@
+ CORBA::SystemException
+ )) = 0;
+
- virtual IR::PrimitiveDef_ptr get_primitive (
+ virtual IR_PrimitiveDef_ptr get_primitive (
CORBA_Object *_collocated_tao_target_,
@@ -11581,7 +9453,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
-@@ -9163,7 +5688,7 @@
+@@ -9160,7 +7432,7 @@
CORBA::SystemException
)) = 0;
@@ -11590,7 +9462,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
-@@ -9172,27 +5697,27 @@
+@@ -9169,27 +7441,27 @@
CORBA::SystemException
)) = 0;
@@ -11623,7 +9495,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::UShort digits,
CORBA::Short scale,
-@@ -9206,6 +5731,7 @@
+@@ -9203,6 +7475,7 @@
_TAO_Repository_Proxy_Impl (void);
};
@@ -11631,32 +9503,25 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -9215,18 +5741,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_Repository_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_Repository_Remote_Proxy_Impl :
+@@ -9215,7 +7488,7 @@
+ class TAO_IFR_Client_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:
- _TAO_Repository_Remote_Proxy_Impl (void);
--
-+
+@@ -9223,7 +7496,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
-@@ -9244,16 +5770,16 @@
+@@ -9241,16 +7514,16 @@
CORBA::SystemException
));
@@ -11676,7 +9541,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
-@@ -9262,7 +5788,7 @@
+@@ -9259,7 +7532,7 @@
CORBA::SystemException
));
@@ -11685,7 +9550,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
-@@ -9271,27 +5797,27 @@
+@@ -9268,27 +7541,27 @@
CORBA::SystemException
));
@@ -11718,24 +9583,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::UShort digits,
CORBA::Short scale,
-@@ -9309,49 +5835,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_Repository_Proxy_Broker
+@@ -9320,8 +7593,9 @@
{
public:
virtual ~_TAO_Repository_Proxy_Broker (void);
@@ -11746,48 +9594,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_Repository_Proxy_Broker (void);
--
-+
+@@ -9330,6 +7604,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_Repository_Remote_Proxy_Broker : public virtual _TAO_Repository_Proxy_Broker
- {
--public:
-+public:
- _TAO_Repository_Remote_Proxy_Broker (void);
--
-+
+@@ -9347,7 +7622,7 @@
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 ()
);
-@@ -9365,142 +5892,109 @@
+@@ -9361,127 +7636,94 @@
static _TAO_Repository_Remote_Proxy_Broker *the_TAO_Repository_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -11816,31 +9646,28 @@
- 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 &();
-- // in, inout, out, _retn
++ 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_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
-+
-+ 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
+ IR_ComponentRepository_ptr in (void) const;
+ IR_ComponentRepository_ptr &inout (void);
+ IR_ComponentRepository_ptr &out (void);
@@ -11877,7 +9704,6 @@
- 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 &);
@@ -11887,7 +9713,7 @@
+ operator IR_ComponentRepository_ptr &();
+ IR_ComponentRepository_ptr &ptr (void);
+ IR_ComponentRepository_ptr operator-> (void);
-+
+
private:
- ComponentRepository_ptr &ptr_;
+ IR_ComponentRepository_ptr &ptr_;
@@ -11923,15 +9749,13 @@
+ static IR_ComponentRepository_ptr _duplicate (IR_ComponentRepository_ptr obj);
+ static IR_ComponentRepository_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static ComponentRepository_ptr _nil (void)
@@ -11950,13 +9774,12 @@
const char * version,
- IR::ComponentDef_ptr base_component,
- const IR::InterfaceDefSeq & supports_interfaces,
-- CORBA::Environment &ACE_TRY_ENV =
+ 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 ((
+@@ -9489,13 +7731,13 @@
CORBA::SystemException
));
@@ -11968,199 +9791,128 @@
- IR::HomeDef_ptr base_home,
- IR::ComponentDef_ptr managed_component,
- IR::ValueDef_ptr primary_key,
-- CORBA::Environment &ACE_TRY_ENV =
+ 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 ((
-@@ -9508,153 +6002,39 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -9516,14 +7758,14 @@
_TAO_ComponentRepository_Proxy_Broker *the_TAO_ComponentRepository_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- ComponentRepository (
-- TAO_Stub *objref,
+ 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 IR_ComponentRepository_setup_collocation (int collocated);
+
+- ComponentRepository (
+ IR_ComponentRepository (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -9533,10 +7775,10 @@
+ friend class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
+ friend class _TAO_ComponentRepository_Direct_Proxy_Impl;
+
- virtual ~ComponentRepository (void);
--private:
++ virtual ~IR_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:
++ IR_ComponentRepository (const IR_ComponentRepository &);
++ void operator= (const IR_ComponentRepository &);
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -9546,7 +7788,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++ friend class IR_ComponentRepository;
+
+ friend class _TAO_ComponentRepository_Remote_Proxy_Impl;
+ friend class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
+@@ -9558,8 +7800,8 @@
+ 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 ()
++ 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_;
+@@ -9588,17 +7830,17 @@
+ 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 base_component_;
++ const IR_InterfaceDefSeq & supports_interfaces_;
++ void result (IR_ComponentDef_ptr result);
+ // update the result
- IR::ComponentDef_ptr _result;
--};
++ IR_ComponentDef_ptr _result;
+ };
--class TAO_ClientRequestInfo_IR_ComponentRepository_create_home : public TAO_ClientRequestInfo
--{
--public:
+ class TAO_ClientRequestInfo_IR_ComponentRepository_create_home : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::ComponentRepository;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
+@@ -9610,9 +7852,9 @@
+ 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 ()
-- );
--
--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_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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -9641,12 +7883,12 @@
+ 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 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 */
--
-+ virtual ~IR_ComponentRepository (void);
-+private:
-+ IR_ComponentRepository (const IR_ComponentRepository &);
-+ void operator= (const IR_ComponentRepository &);
++ IR_HomeDef_ptr _result;
};
-
-@@ -9667,33 +6047,33 @@
- // Base Impl. Declaration
+ #endif /* TAO_HAS_INTERCEPTORS */
+@@ -9664,32 +7906,32 @@
//
--class TAO_IFR_Client_Export _TAO_ComponentRepository_Proxy_Impl :
+ class TAO_IFR_Client_Export _TAO_ComponentRepository_Proxy_Impl :
- public virtual IR::_TAO_Repository_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_ComponentRepository_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,
@@ -12191,7 +9943,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -9704,6 +6084,7 @@
+@@ -9700,6 +7942,7 @@
_TAO_ComponentRepository_Proxy_Impl (void);
};
@@ -12199,27 +9951,20 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -9713,38 +6094,38 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_ComponentRepository_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_ComponentRepository_Remote_Proxy_Impl :
+@@ -9712,7 +7955,7 @@
+ class TAO_IFR_Client_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:
- _TAO_ComponentRepository_Remote_Proxy_Impl (void);
--
-+
+@@ -9720,27 +7963,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,
@@ -12250,24 +9995,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -9759,49 +6140,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ComponentRepository_Proxy_Broker
+@@ -9769,8 +8012,9 @@
{
public:
virtual ~_TAO_ComponentRepository_Proxy_Broker (void);
@@ -12278,48 +10006,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_ComponentRepository_Proxy_Broker (void);
--
-+
+@@ -9779,6 +8023,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ComponentRepository_Remote_Proxy_Broker : public virtual _TAO_ComponentRepository_Proxy_Broker
- {
--public:
-+public:
- _TAO_ComponentRepository_Remote_Proxy_Broker (void);
--
-+
+@@ -9796,7 +8041,7 @@
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 ()
);
-@@ -9815,163 +6197,77 @@
+@@ -9810,117 +8055,39 @@
static _TAO_ComponentRepository_Remote_Proxy_Broker *the_TAO_ComponentRepository_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -12422,15 +10132,13 @@
+ static IR_ModuleDef_ptr _duplicate (IR_ModuleDef_ptr obj);
+ static IR_ModuleDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static ModuleDef_ptr _nil (void)
@@ -12441,159 +10149,68 @@
}
static void _tao_any_destructor (void*);
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -9938,14 +8105,14 @@
_TAO_ModuleDef_Proxy_Broker *the_TAO_ModuleDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- ModuleDef (
-- TAO_Stub *objref,
+ 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 IR_ModuleDef_setup_collocation (int collocated);
+
+- ModuleDef (
+ IR_ModuleDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -9955,10 +8122,10 @@
+ friend class _TAO_ModuleDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ModuleDef_Direct_Proxy_Impl;
+
- virtual ~ModuleDef (void);
--private:
++ virtual ~IR_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 */
-+ );
-
-+ 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 &);
- };
-
-
-@@ -9980,43 +6276,44 @@
- // an invocation logics.
-
--///////////////////////////////////////////////////////////////////////
--// Base Impl. Declaration
--//
-+ ///////////////////////////////////////////////////////////////////////
-+ // Base Impl. Declaration
-+ //
-+
-+ class TAO_IFR_Client_Export _TAO_ModuleDef_Proxy_Impl :
-+ public virtual _TAO_Container_Proxy_Impl,
-+ public virtual _TAO_Contained_Proxy_Impl
-+ {
-+ public:
-+ virtual ~_TAO_ModuleDef_Proxy_Impl (void) { }
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -9980,8 +8147,8 @@
+ //
--class TAO_IFR_Client_Export _TAO_ModuleDef_Proxy_Impl :
+ class TAO_IFR_Client_Export _TAO_ModuleDef_Proxy_Impl :
- public virtual IR::_TAO_Container_Proxy_Impl,
- public virtual IR::_TAO_Contained_Proxy_Impl
--{
--public:
-- virtual ~_TAO_ModuleDef_Proxy_Impl (void) { }
--
- protected:
-- _TAO_ModuleDef_Proxy_Impl (void);
-+ _TAO_ModuleDef_Proxy_Impl (void);
++ public virtual _TAO_Container_Proxy_Impl,
++ public virtual _TAO_Contained_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_ModuleDef_Proxy_Impl (void) { }
+@@ -9990,6 +8157,7 @@
+ _TAO_ModuleDef_Proxy_Impl (void);
--};
--//
--// Base Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
-+ };
+ };
+
-+ //
-+ // Base Proxy Impl. Declaration
-+ ///////////////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////////////////////////////////
- // Remote Impl. Declaration
//
-
--class TAO_IFR_Client_Export _TAO_ModuleDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_ModuleDef_Remote_Proxy_Impl :
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -10002,8 +8170,8 @@
+ class TAO_IFR_Client_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:
- _TAO_ModuleDef_Remote_Proxy_Impl (void);
--
-+
- virtual ~_TAO_ModuleDef_Remote_Proxy_Impl (void) { }
--
-- };
-+
-+};
-
- //
- // Base Proxy Impl. Declaration
-@@ -10024,49 +6321,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ModuleDef_Proxy_Broker
+@@ -10033,8 +8201,9 @@
{
public:
virtual ~_TAO_ModuleDef_Proxy_Broker (void);
@@ -12604,48 +10221,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_ModuleDef_Proxy_Broker (void);
--
-+
+@@ -10043,6 +8212,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ModuleDef_Remote_Proxy_Broker : public virtual _TAO_ModuleDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_ModuleDef_Remote_Proxy_Broker (void);
--
-+
+@@ -10060,7 +8230,7 @@
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 ()
);
-@@ -10080,24 +6378,15 @@
+@@ -10074,24 +8244,15 @@
static _TAO_ModuleDef_Remote_Proxy_Broker *the_TAO_ModuleDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -12666,7 +10265,7 @@
#endif /* ! __GNUC__ || g++ >= 2.8 */
static void _tao_any_destructor (void*);
-@@ -10108,170 +6397,96 @@
+@@ -10102,156 +8263,82 @@
TAO_String_Manager version;
};
@@ -12678,31 +10277,50 @@
- ModuleDescription_var (ModuleDescription *);
- ModuleDescription_var (const ModuleDescription_var &); // copy constructor
- ~ModuleDescription_var (void); // destructor
--
++ 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
+
- ModuleDescription_var &operator= (ModuleDescription *);
- ModuleDescription_var &operator= (const ModuleDescription_var &);
- ModuleDescription *operator-> (void);
- const ModuleDescription *operator-> (void) const;
--
++ 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 ModuleDescription &() const;
- operator ModuleDescription &();
- operator ModuleDescription &() const;
- operator ModuleDescription *&(); // variable-size types only
--
-- // in, inout, out, _retn
++ operator const IR_ModuleDescription &() const;
++ operator IR_ModuleDescription &();
++ operator IR_ModuleDescription &() const;
++ operator IR_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:
++ const IR_ModuleDescription &in (void) const;
++ IR_ModuleDescription &inout (void);
++ IR_ModuleDescription *&out (void);
++ IR_ModuleDescription *_retn (void);
++ IR_ModuleDescription *ptr (void) const;
+
+ private:
- ModuleDescription *ptr_;
--};
--
++ IR_ModuleDescription *ptr_;
+ };
+
-class TAO_IFR_Client_Export ModuleDescription_out
--{
--public:
++class TAO_IFR_Client_Export IR_ModuleDescription_out
+ {
+ public:
- ModuleDescription_out (ModuleDescription *&);
- ModuleDescription_out (ModuleDescription_var &);
- ModuleDescription_out (const ModuleDescription_out &);
@@ -12711,10 +10329,19 @@
- operator ModuleDescription *&();
- ModuleDescription *&ptr (void);
- ModuleDescription *operator-> (void);
--
--private:
++ 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:
- ModuleDescription *&ptr_;
-- // assignment from T_var not allowed
++ IR_ModuleDescription *&ptr_;
+ // assignment from T_var not allowed
- void operator= (const ModuleDescription_var &);
-};
-
@@ -12728,23 +10355,11 @@
-typedef ConstantDef *ConstantDef_ptr;
-
-#endif /* end #if !defined */
-+ 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
-
-+ IR_ModuleDescription_var &operator= (IR_ModuleDescription *);
-+ IR_ModuleDescription_var &operator= (const IR_ModuleDescription_var &);
-+ IR_ModuleDescription *operator-> (void);
-+ const IR_ModuleDescription *operator-> (void) const;
-
+-
+-
-#if !defined (_IR_CONSTANTDEF___VAR_CH_)
-#define _IR_CONSTANTDEF___VAR_CH_
-+ operator const IR_ModuleDescription &() const;
-+ operator IR_ModuleDescription &();
-+ operator IR_ModuleDescription &() const;
-+ operator IR_ModuleDescription *&(); // variable-size types only
-
+-
-class TAO_IFR_Client_Export ConstantDef_var : public TAO_Base_var
-{
-public:
@@ -12765,21 +10380,14 @@
- ConstantDef_ptr &out (void);
- ConstantDef_ptr _retn (void);
- ConstantDef_ptr ptr (void) const;
-+ // in, inout, out, _retn
-+ const IR_ModuleDescription &in (void) const;
-+ IR_ModuleDescription &inout (void);
-+ IR_ModuleDescription *&out (void);
-+ IR_ModuleDescription *_retn (void);
-+ IR_ModuleDescription *ptr (void) const;
-
- private:
+-
+-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 */
-
@@ -12788,9 +10396,8 @@
-#define _IR_CONSTANTDEF___OUT_CH_
-
-class TAO_IFR_Client_Export ConstantDef_out
-+class TAO_IFR_Client_Export IR_ModuleDescription_out
- {
- public:
+-{
+-public:
- ConstantDef_out (ConstantDef_ptr &);
- ConstantDef_out (ConstantDef_var &);
- ConstantDef_out (const ConstantDef_out &);
@@ -12801,19 +10408,8 @@
- 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:
+-private:
- ConstantDef_ptr &ptr_;
-+ IR_ModuleDescription *&ptr_;
-+ // assignment from T_var not allowed
+ void operator= (const IR_ModuleDescription_var &);
};
@@ -12847,15 +10443,13 @@
+ static IR_ConstantDef_ptr _duplicate (IR_ConstantDef_ptr obj);
+ static IR_ConstantDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static ConstantDef_ptr _nil (void)
@@ -12866,359 +10460,137 @@
}
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 ((
+@@ -10264,7 +8351,7 @@
CORBA::SystemException
));
- virtual IR::IDLType_ptr type_def (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_IDLType_ptr type_def (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -10279,8 +6494,8 @@
+@@ -10273,7 +8360,7 @@
));
virtual void type_def (
- IR::IDLType_ptr type_def,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_IDLType_ptr type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -10288,7 +6503,7 @@
- ));
-
- virtual CORBA::Any * value (
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -10297,7 +6512,7 @@
-
- virtual void value (
- const CORBA::Any & value,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -10305,276 +6520,58 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -10311,14 +8398,14 @@
_TAO_ConstantDef_Proxy_Broker *the_TAO_ConstantDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- ConstantDef (
-- TAO_Stub *objref,
+ 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 IR_ConstantDef_setup_collocation (int collocated);
+
+- ConstantDef (
+ IR_ConstantDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -10328,10 +8415,10 @@
+ friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ConstantDef_Direct_Proxy_Impl;
+
- virtual ~ConstantDef (void);
--private:
++ virtual ~IR_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
--};
++ IR_ConstantDef (const IR_ConstantDef &);
++ void operator= (const IR_ConstantDef &);
--class TAO_ClientRequestInfo_IR_ConstantDef_type_def_get : public TAO_ClientRequestInfo
--{
--public:
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -10341,7 +8428,7 @@
+ class TAO_ClientRequestInfo_IR_ConstantDef_type_get : public TAO_ClientRequestInfo
+ {
+ public:
+- friend class IR::ConstantDef;
++ friend class IR_ConstantDef;
+
+ friend class _TAO_ConstantDef_Remote_Proxy_Impl;
+ friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
+@@ -10383,7 +8470,7 @@
+ class TAO_ClientRequestInfo_IR_ConstantDef_type_def_get : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::ConstantDef;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual ~IR_ConstantDef (void);
-+private:
-+ IR_ConstantDef (const IR_ConstantDef &);
-+ void operator= (const IR_ConstantDef &);
-+};
-
--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_ConstantDef_type_def_get (const TAO_ClientRequestInfo_IR_ConstantDef_type_def_get &);
-- void operator= (const TAO_ClientRequestInfo_IR_ConstantDef_type_def_get &);
+@@ -10417,15 +8504,15 @@
+ 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
++ void result (IR_IDLType_ptr result);
+ // update the result
- IR::IDLType_ptr _result;
--};
-+///////////////////////////////////////////////////////////////////////
-+// Base Impl. Declaration
-+//
++ IR_IDLType_ptr _result;
+ };
--class TAO_ClientRequestInfo_IR_ConstantDef_type_def_set : public TAO_ClientRequestInfo
-+class TAO_IFR_Client_Export _TAO_ConstantDef_Proxy_Impl :
-+ public virtual _TAO_Contained_Proxy_Impl
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_ConstantDef;
+
+ friend class _TAO_ConstantDef_Remote_Proxy_Impl;
+ friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
+@@ -10434,7 +8521,7 @@
+ TAO_ClientRequestInfo_IR_ConstantDef_type_def_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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 ~_TAO_ConstantDef_Proxy_Impl (void) { }
-
--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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -10460,14 +8547,14 @@
+ 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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
+@@ -10509,7 +8596,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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));
--
--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 */
--
--};
--
--
--// The Proxy Implementations are used by each interface to
--// perform a call. Each different implementation encapsulate
--// an invocation logics.
--
--
--///////////////////////////////////////////////////////////////////////
--// Base Impl. Declaration
--//
--
--class TAO_IFR_Client_Export _TAO_ConstantDef_Proxy_Impl :
++ friend class IR_ConstantDef;
+
+ friend class _TAO_ConstantDef_Remote_Proxy_Impl;
+ friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
+@@ -10563,7 +8650,7 @@
+ //
+
+ class TAO_IFR_Client_Export _TAO_ConstantDef_Proxy_Impl :
- public virtual IR::_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
- )
-@@ -10582,7 +6579,7 @@
++ public virtual _TAO_Contained_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_ConstantDef_Proxy_Impl (void) { }
+@@ -10576,7 +8663,7 @@
CORBA::SystemException
)) = 0;
@@ -13227,7 +10599,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -10592,7 +6589,7 @@
+@@ -10586,7 +8673,7 @@
virtual void type_def (
CORBA_Object *_collocated_tao_target_,
@@ -13236,7 +10608,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -10620,6 +6617,7 @@
+@@ -10614,6 +8701,7 @@
_TAO_ConstantDef_Proxy_Impl (void);
};
@@ -13244,33 +10616,16 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -10629,26 +6627,26 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_ConstantDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_ConstantDef_Remote_Proxy_Impl :
+@@ -10626,7 +8714,7 @@
+ class TAO_IFR_Client_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:
- _TAO_ConstantDef_Remote_Proxy_Impl (void);
--
-+
- 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 ((
+@@ -10642,7 +8730,7 @@
CORBA::SystemException
));
@@ -13279,7 +10634,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -10658,22 +6656,22 @@
+@@ -10652,7 +8740,7 @@
virtual void type_def (
CORBA_Object *_collocated_tao_target_,
@@ -13288,94 +10643,39 @@
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
-@@ -10690,49 +6688,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ConstantDef_Proxy_Broker
- {
+@@ -10699,7 +8787,7 @@
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;
- protected:
- _TAO_ConstantDef_Proxy_Broker (void);
--
-+
+@@ -10708,6 +8796,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ConstantDef_Remote_Proxy_Broker : public virtual _TAO_ConstantDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_ConstantDef_Remote_Proxy_Broker (void);
--
-+
+@@ -10725,7 +8814,7 @@
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 ()
);
-@@ -10746,24 +6745,15 @@
+@@ -10739,24 +8828,15 @@
static _TAO_ConstantDef_Remote_Proxy_Broker *the_TAO_ConstantDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -13396,7 +10696,7 @@
#endif /* ! __GNUC__ || g++ >= 2.8 */
static void _tao_any_destructor (void*);
-@@ -10776,202 +6766,165 @@
+@@ -10769,156 +8849,127 @@
CORBA::Any value;
};
@@ -13408,31 +10708,50 @@
- ConstantDescription_var (ConstantDescription *);
- ConstantDescription_var (const ConstantDescription_var &); // copy constructor
- ~ConstantDescription_var (void); // destructor
--
++ 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
+
- ConstantDescription_var &operator= (ConstantDescription *);
- ConstantDescription_var &operator= (const ConstantDescription_var &);
- ConstantDescription *operator-> (void);
- const ConstantDescription *operator-> (void) const;
--
++ 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 ConstantDescription &() const;
- operator ConstantDescription &();
- operator ConstantDescription &() const;
- operator ConstantDescription *&(); // variable-size types only
--
-- // in, inout, out, _retn
++ 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;
--
--private:
++ 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_IFR_Client_Export ConstantDescription_out
--{
--public:
++class TAO_IFR_Client_Export IR_ConstantDescription_out
+ {
+ public:
- ConstantDescription_out (ConstantDescription *&);
- ConstantDescription_out (ConstantDescription_var &);
- ConstantDescription_out (const ConstantDescription_out &);
@@ -13441,120 +10760,91 @@
- operator ConstantDescription *&();
- ConstantDescription *&ptr (void);
- ConstantDescription *operator-> (void);
--
--private:
++ 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_;
-- // assignment from T_var not allowed
++ 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 (_IR_TYPEDEFDEF___PTR_CH_)
-#define _IR_TYPEDEFDEF___PTR_CH_
-+ 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
-
+-
-class TypedefDef;
-typedef TypedefDef *TypedefDef_ptr;
-+ IR_ConstantDescription_var &operator= (IR_ConstantDescription *);
-+ IR_ConstantDescription_var &operator= (const IR_ConstantDescription_var &);
-+ IR_ConstantDescription *operator-> (void);
-+ const IR_ConstantDescription *operator-> (void) const;
-
+-
-#endif /* end #if !defined */
-+ operator const IR_ConstantDescription &() const;
-+ operator IR_ConstantDescription &();
-+ operator IR_ConstantDescription &() const;
-+ operator IR_ConstantDescription *&(); // variable-size types only
-
-+ // in, inout, out, _retn
-+ const IR_ConstantDescription &in (void) const;
-+ IR_ConstantDescription &inout (void);
-+ IR_ConstantDescription *&out (void);
-+ IR_ConstantDescription *_retn (void);
-+ IR_ConstantDescription *ptr (void) const;
-
+-
+-
-#if !defined (_IR_TYPEDEFDEF___VAR_CH_)
-#define _IR_TYPEDEFDEF___VAR_CH_
-+private:
-+ IR_ConstantDescription *ptr_;
-+};
-
+-
-class TAO_IFR_Client_Export TypedefDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_ConstantDescription_out
++class TAO_IFR_Client_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 &();
-- // in, inout, out, _retn
++ 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_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:
-- TypedefDef_ptr ptr_;
-- // Unimplemented - prevents widening assignment.
-- TypedefDef_var (const TAO_Base_var &rhs);
-- TypedefDef_var &operator= (const TAO_Base_var &rhs);
-+ IR_ConstantDescription *&ptr_;
-+ // assignment from T_var not allowed
-+ void operator= (const IR_ConstantDescription_var &);
- };
-
-+class TAO_IFR_Client_Export IR_TypedefDef_var : public TAO_Base_var
-+{
-+public:
-+ 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
-
--#endif /* end #if !defined */
-+ 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
+ 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;
--#if !defined (_IR_TYPEDEFDEF___OUT_CH_)
--#define _IR_TYPEDEFDEF___OUT_CH_
-+private:
+ private:
+- TypedefDef_ptr ptr_;
+ IR_TypedefDef_ptr ptr_;
-+ // Unimplemented - prevents widening assignment.
+ // 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 (_IR_TYPEDEFDEF___OUT_CH_)
+-#define _IR_TYPEDEFDEF___OUT_CH_
+-
-class TAO_IFR_Client_Export TypedefDef_out
+class TAO_IFR_Client_Export IR_TypedefDef_out
{
@@ -13568,7 +10858,6 @@
- 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 &);
@@ -13578,7 +10867,7 @@
+ operator IR_TypedefDef_ptr &();
+ IR_TypedefDef_ptr &ptr (void);
+ IR_TypedefDef_ptr operator-> (void);
-+
+
private:
- TypedefDef_ptr &ptr_;
+ IR_TypedefDef_ptr &ptr_;
@@ -13614,15 +10903,13 @@
+ static IR_TypedefDef_ptr _duplicate (IR_TypedefDef_ptr obj);
+ static IR_TypedefDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static TypedefDef_ptr _nil (void)
@@ -13633,206 +10920,100 @@
}
static void _tao_any_destructor (void*);
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -10936,14 +8987,14 @@
_TAO_TypedefDef_Proxy_Broker *the_TAO_TypedefDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- TypedefDef (
-- TAO_Stub *objref,
+ 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 IR_TypedefDef_setup_collocation (int collocated);
+
+- TypedefDef (
+ IR_TypedefDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -10953,10 +9004,10 @@
+ friend class _TAO_TypedefDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_TypedefDef_Direct_Proxy_Impl;
+
- virtual ~TypedefDef (void);
--private:
++ virtual ~IR_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 */
-+ );
-+
-+ 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 &);
- };
-
-
-@@ -10980,21 +6933,22 @@
- // an invocation logics.
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -10978,8 +9029,8 @@
+ //
--///////////////////////////////////////////////////////////////////////
--// Base Impl. Declaration
--//
-+ ///////////////////////////////////////////////////////////////////////
-+ // Base Impl. Declaration
-+ //
-+
-+ class TAO_IFR_Client_Export _TAO_TypedefDef_Proxy_Impl :
+ class TAO_IFR_Client_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) { }
+ {
+ public:
+ virtual ~_TAO_TypedefDef_Proxy_Impl (void) { }
+@@ -10988,6 +9039,7 @@
+ _TAO_TypedefDef_Proxy_Impl (void);
--class TAO_IFR_Client_Export _TAO_TypedefDef_Proxy_Impl :
-- public virtual IR::_TAO_Contained_Proxy_Impl,
-- public virtual IR::_TAO_IDLType_Proxy_Impl
--{
--public:
-- virtual ~_TAO_TypedefDef_Proxy_Impl (void) { }
--
- protected:
-- _TAO_TypedefDef_Proxy_Impl (void);
-+ _TAO_TypedefDef_Proxy_Impl (void);
+ };
+
-+ };
-
--};
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -11004,19 +6958,19 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_TypedefDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_TypedefDef_Remote_Proxy_Impl :
+@@ -11000,8 +9052,8 @@
+ class TAO_IFR_Client_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:
- _TAO_TypedefDef_Remote_Proxy_Impl (void);
--
-+
- virtual ~_TAO_TypedefDef_Remote_Proxy_Impl (void) { }
--
-- };
-+
-+};
-
- //
- // Base Proxy Impl. Declaration
-@@ -11024,49 +6978,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_TypedefDef_Proxy_Broker
- {
+@@ -11032,7 +9084,7 @@
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;
- protected:
- _TAO_TypedefDef_Proxy_Broker (void);
--
-+
+@@ -11041,6 +9093,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_TypedefDef_Remote_Proxy_Broker : public virtual _TAO_TypedefDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_TypedefDef_Remote_Proxy_Broker (void);
--
-+
+@@ -11058,7 +9111,7 @@
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 ()
);
-@@ -11080,24 +7035,15 @@
+@@ -11072,24 +9125,15 @@
static _TAO_TypedefDef_Remote_Proxy_Broker *the_TAO_TypedefDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -13853,7 +11034,7 @@
#endif /* ! __GNUC__ || g++ >= 2.8 */
static void _tao_any_destructor (void*);
-@@ -11109,171 +7055,97 @@
+@@ -11101,161 +9145,87 @@
CORBA::TypeCode_var type;
};
@@ -13865,31 +11046,50 @@
- TypeDescription_var (TypeDescription *);
- TypeDescription_var (const TypeDescription_var &); // copy constructor
- ~TypeDescription_var (void); // destructor
--
++ 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
+
- TypeDescription_var &operator= (TypeDescription *);
- TypeDescription_var &operator= (const TypeDescription_var &);
- TypeDescription *operator-> (void);
- const TypeDescription *operator-> (void) const;
--
++ 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 TypeDescription &() const;
- operator TypeDescription &();
- operator TypeDescription &() const;
- operator TypeDescription *&(); // variable-size types only
--
-- // in, inout, out, _retn
++ operator const IR_TypeDescription &() const;
++ operator IR_TypeDescription &();
++ operator IR_TypeDescription &() const;
++ operator IR_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:
++ const IR_TypeDescription &in (void) const;
++ IR_TypeDescription &inout (void);
++ IR_TypeDescription *&out (void);
++ IR_TypeDescription *_retn (void);
++ IR_TypeDescription *ptr (void) const;
+
+ private:
- TypeDescription *ptr_;
--};
--
++ IR_TypeDescription *ptr_;
+ };
+
-class TAO_IFR_Client_Export TypeDescription_out
--{
--public:
++class TAO_IFR_Client_Export IR_TypeDescription_out
+ {
+ public:
- TypeDescription_out (TypeDescription *&);
- TypeDescription_out (TypeDescription_var &);
- TypeDescription_out (const TypeDescription_out &);
@@ -13898,10 +11098,19 @@
- operator TypeDescription *&();
- TypeDescription *&ptr (void);
- TypeDescription *operator-> (void);
--
--private:
++ 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:
- TypeDescription *&ptr_;
-- // assignment from T_var not allowed
++ IR_TypeDescription *&ptr_;
+ // assignment from T_var not allowed
- void operator= (const TypeDescription_var &);
-};
-
@@ -13915,23 +11124,11 @@
-typedef StructDef *StructDef_ptr;
-
-#endif /* end #if !defined */
-+ 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
-
-+ IR_TypeDescription_var &operator= (IR_TypeDescription *);
-+ IR_TypeDescription_var &operator= (const IR_TypeDescription_var &);
-+ IR_TypeDescription *operator-> (void);
-+ const IR_TypeDescription *operator-> (void) const;
-
+-
+-
-#if !defined (_IR_STRUCTDEF___VAR_CH_)
-#define _IR_STRUCTDEF___VAR_CH_
-+ operator const IR_TypeDescription &() const;
-+ operator IR_TypeDescription &();
-+ operator IR_TypeDescription &() const;
-+ operator IR_TypeDescription *&(); // variable-size types only
-
+-
-class TAO_IFR_Client_Export StructDef_var : public TAO_Base_var
-{
-public:
@@ -13952,21 +11149,14 @@
- StructDef_ptr &out (void);
- StructDef_ptr _retn (void);
- StructDef_ptr ptr (void) const;
-+ // in, inout, out, _retn
-+ const IR_TypeDescription &in (void) const;
-+ IR_TypeDescription &inout (void);
-+ IR_TypeDescription *&out (void);
-+ IR_TypeDescription *_retn (void);
-+ IR_TypeDescription *ptr (void) const;
-
- private:
+-
+-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 */
-
@@ -13975,9 +11165,8 @@
-#define _IR_STRUCTDEF___OUT_CH_
-
-class TAO_IFR_Client_Export StructDef_out
-+class TAO_IFR_Client_Export IR_TypeDescription_out
- {
- public:
+-{
+-public:
- StructDef_out (StructDef_ptr &);
- StructDef_out (StructDef_var &);
- StructDef_out (const StructDef_out &);
@@ -13988,19 +11177,8 @@
- 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:
+-private:
- StructDef_ptr &ptr_;
-+ IR_TypeDescription *&ptr_;
-+ // assignment from T_var not allowed
+ void operator= (const IR_TypeDescription_var &);
};
@@ -14034,15 +11212,13 @@
+ static IR_StructDef_ptr _duplicate (IR_StructDef_ptr obj);
+ static IR_StructDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static StructDef_ptr _nil (void)
@@ -14055,194 +11231,114 @@
static void _tao_any_destructor (void*);
- virtual IR::StructMemberSeq * members (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_StructMemberSeq * members (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
+@@ -11264,7 +9234,7 @@
));
-- virtual void members (
+ virtual void members (
- const IR::StructMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV =
-+ virtual void members (
+ const IR_StructMemberSeq & members,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -11281,131 +7153,39 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -11285,14 +9255,14 @@
_TAO_StructDef_Proxy_Broker *the_TAO_StructDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- StructDef (
-- TAO_Stub *objref,
+ 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 IR_StructDef_setup_collocation (int collocated);
+
+- StructDef (
+ IR_StructDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -11302,10 +9272,10 @@
+ friend class _TAO_StructDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_StructDef_Direct_Proxy_Impl;
+
- virtual ~StructDef (void);
--private:
++ virtual ~IR_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:
++ IR_StructDef (const IR_StructDef &);
++ void operator= (const IR_StructDef &);
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -11315,7 +9285,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_StructDef;
+
+ friend class _TAO_StructDef_Remote_Proxy_Impl;
+ friend class _TAO_StructDef_ThruPOA_Proxy_Impl;
+@@ -11349,15 +9319,15 @@
+ 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
++ void result (IR_StructMemberSeq * result);
+ // update the result
- IR::StructMemberSeq * _result;
--};
++ IR_StructMemberSeq * _result;
+ };
--class TAO_ClientRequestInfo_IR_StructDef_members_set : public TAO_ClientRequestInfo
--{
--public:
+ class TAO_ClientRequestInfo_IR_StructDef_members_set : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::StructDef;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
+@@ -11366,7 +9336,7 @@
+ TAO_ClientRequestInfo_IR_StructDef_members_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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_StructDef_members_set (const TAO_ClientRequestInfo_IR_StructDef_members_set &);
-- void operator= (const TAO_ClientRequestInfo_IR_StructDef_members_set &);
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -11392,7 +9362,7 @@
+ 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 */
--
-+ virtual ~IR_StructDef (void);
-+private:
-+ IR_StructDef (const IR_StructDef &);
-+ void operator= (const IR_StructDef &);
++ const IR_StructMemberSeq & members_;
+
};
-
-@@ -11418,14 +7198,14 @@
- // Base Impl. Declaration
+@@ -11411,13 +9381,13 @@
//
--class TAO_IFR_Client_Export _TAO_StructDef_Proxy_Impl :
+ class TAO_IFR_Client_Export _TAO_StructDef_Proxy_Impl :
- public virtual IR::_TAO_TypedefDef_Proxy_Impl,
- public virtual IR::_TAO_Container_Proxy_Impl
-+class TAO_IFR_Client_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 (
-+
+ virtual IR_StructMemberSeq * members (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -11435,7 +7215,7 @@
+@@ -11427,7 +9397,7 @@
virtual void members (
CORBA_Object *_collocated_tao_target_,
@@ -14251,7 +11347,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -11446,6 +7226,7 @@
+@@ -11438,6 +9408,7 @@
_TAO_StructDef_Proxy_Impl (void);
};
@@ -14259,34 +11355,27 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -11455,19 +7236,19 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_StructDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_StructDef_Remote_Proxy_Impl :
+@@ -11450,8 +9421,8 @@
+ class TAO_IFR_Client_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:
- _TAO_StructDef_Remote_Proxy_Impl (void);
--
-+
+@@ -11459,7 +9430,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
)
-@@ -11477,7 +7258,7 @@
+@@ -11469,7 +9440,7 @@
virtual void members (
CORBA_Object *_collocated_tao_target_,
@@ -14295,24 +11384,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -11492,49 +7273,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_StructDef_Proxy_Broker
+@@ -11498,8 +9469,9 @@
{
public:
virtual ~_TAO_StructDef_Proxy_Broker (void);
@@ -14323,48 +11395,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_StructDef_Proxy_Broker (void);
--
-+
+@@ -11508,6 +9480,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_StructDef_Remote_Proxy_Broker : public virtual _TAO_StructDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_StructDef_Remote_Proxy_Broker (void);
--
-+
+@@ -11525,7 +9498,7 @@
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 ()
);
-@@ -11548,131 +7330,53 @@
+@@ -11539,117 +9512,39 @@
static _TAO_StructDef_Remote_Proxy_Broker *the_TAO_StructDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -14467,15 +11521,13 @@
+ static IR_UnionDef_ptr _duplicate (IR_UnionDef_ptr obj);
+ static IR_UnionDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static UnionDef_ptr _nil (void)
@@ -14486,361 +11538,185 @@
}
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 ((
+@@ -11662,7 +9557,7 @@
CORBA::SystemException
));
- virtual IR::IDLType_ptr discriminator_type_def (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_IDLType_ptr discriminator_type_def (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -11680,16 +7384,16 @@
+@@ -11671,7 +9566,7 @@
));
virtual void discriminator_type_def (
- IR::IDLType_ptr discriminator_type_def,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_IDLType_ptr discriminator_type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -11679,7 +9574,7 @@
CORBA::SystemException
));
- virtual IR::UnionMemberSeq * members (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_UnionMemberSeq * members (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -11697,8 +7401,8 @@
+@@ -11688,7 +9583,7 @@
));
virtual void members (
- const IR::UnionMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV =
+ const IR_UnionMemberSeq & members,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -11706,277 +7410,59 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -11709,14 +9604,14 @@
_TAO_UnionDef_Proxy_Broker *the_TAO_UnionDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- UnionDef (
-- TAO_Stub *objref,
+ 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 IR_UnionDef_setup_collocation (int collocated);
+
+- UnionDef (
+ IR_UnionDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -11726,10 +9621,10 @@
+ friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_UnionDef_Direct_Proxy_Impl;
+
- virtual ~UnionDef (void);
--private:
++ virtual ~IR_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
--};
++ IR_UnionDef (const IR_UnionDef &);
++ void operator= (const IR_UnionDef &);
--class TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get : public TAO_ClientRequestInfo
--{
--public:
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -11739,7 +9634,7 @@
+ class TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get : public TAO_ClientRequestInfo
+ {
+ public:
+- friend class IR::UnionDef;
++ friend class IR_UnionDef;
+
+ friend class _TAO_UnionDef_Remote_Proxy_Impl;
+ friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
+@@ -11781,7 +9676,7 @@
+ class TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::UnionDef;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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_UnionDef (void);
+@@ -11815,15 +9710,15 @@
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 &);
+ 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
++ void result (IR_IDLType_ptr result);
+ // update the result
- IR::IDLType_ptr _result;
-+ IR_UnionDef (const IR_UnionDef &);
-+ void operator= (const IR_UnionDef &);
++ IR_IDLType_ptr _result;
};
--class TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set : public TAO_ClientRequestInfo
--{
--public:
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_UnionDef;
+
+ friend class _TAO_UnionDef_Remote_Proxy_Impl;
+ friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
+@@ -11832,7 +9727,7 @@
+ TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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));
-+// 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_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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -11858,14 +9753,14 @@
+ 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_;
--
--};
-+///////////////////////////////////////////////////////////////////////
-+// Base Impl. Declaration
-+//
++ IR_IDLType_ptr discriminator_type_def_;
+
+ };
--class TAO_ClientRequestInfo_IR_UnionDef_members_get : public TAO_ClientRequestInfo
--{
--public:
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_UnionDef;
+
+ friend class _TAO_UnionDef_Remote_Proxy_Impl;
+ friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
+@@ -11899,15 +9794,15 @@
+ 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
++ void result (IR_UnionMemberSeq * result);
+ // update the result
- IR::UnionMemberSeq * _result;
--};
--
--class TAO_ClientRequestInfo_IR_UnionDef_members_set : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_UnionDef;
+
+ friend class _TAO_UnionDef_Remote_Proxy_Impl;
+ friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
+@@ -11916,7 +9811,7 @@
+ TAO_ClientRequestInfo_IR_UnionDef_members_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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));
--
--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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -11942,7 +9837,7 @@
+ 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 */
--
--};
--
--
--// The Proxy Implementations are used by each interface to
--// perform a call. Each different implementation encapsulate
--// an invocation logics.
--
--
--///////////////////////////////////////////////////////////////////////
--// Base Impl. Declaration
--//
--
--class TAO_IFR_Client_Export _TAO_UnionDef_Proxy_Impl :
++ const IR_UnionMemberSeq & members_;
+
+ };
+
+@@ -11961,8 +9856,8 @@
+ //
+
+ class TAO_IFR_Client_Export _TAO_UnionDef_Proxy_Impl :
- public virtual IR::_TAO_TypedefDef_Proxy_Impl,
- public virtual IR::_TAO_Container_Proxy_Impl
-+class TAO_IFR_Client_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 (
-+
-+ virtual CORBA::TypeCode_ptr discriminator_type (
- CORBA_Object *_collocated_tao_target_,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -11984,7 +7470,7 @@
+@@ -11975,7 +9870,7 @@
CORBA::SystemException
)) = 0;
@@ -14849,7 +11725,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -11994,24 +7480,24 @@
+@@ -11985,14 +9880,14 @@
virtual void discriminator_type_def (
CORBA_Object *_collocated_tao_target_,
@@ -14864,22 +11740,18 @@
- virtual IR::UnionMemberSeq * members (
+ virtual IR_UnionMemberSeq * members (
CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+@@ -12002,7 +9897,7 @@
-- virtual void members (
-+ 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 ((
-@@ -12022,6 +7508,7 @@
+@@ -12013,6 +9908,7 @@
_TAO_UnionDef_Proxy_Impl (void);
};
@@ -14887,34 +11759,18 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -12031,19 +7518,19 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_UnionDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_UnionDef_Remote_Proxy_Impl :
+@@ -12025,8 +9921,8 @@
+ class TAO_IFR_Client_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:
- _TAO_UnionDef_Remote_Proxy_Impl (void);
--
-+
- 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
- )
-@@ -12051,7 +7538,7 @@
+@@ -12042,7 +9938,7 @@
CORBA::SystemException
));
@@ -14923,7 +11779,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -12061,14 +7548,14 @@
+@@ -12052,14 +9948,14 @@
virtual void discriminator_type_def (
CORBA_Object *_collocated_tao_target_,
@@ -14940,7 +11796,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -12078,7 +7565,7 @@
+@@ -12069,7 +9965,7 @@
virtual void members (
CORBA_Object *_collocated_tao_target_,
@@ -14949,24 +11805,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -12093,49 +7580,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_UnionDef_Proxy_Broker
+@@ -12098,8 +9994,9 @@
{
public:
virtual ~_TAO_UnionDef_Proxy_Broker (void);
@@ -14977,48 +11816,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_UnionDef_Proxy_Broker (void);
--
-+
+@@ -12108,6 +10005,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_UnionDef_Remote_Proxy_Broker : public virtual _TAO_UnionDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_UnionDef_Remote_Proxy_Broker (void);
--
-+
+@@ -12125,7 +10023,7 @@
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 ()
);
-@@ -12149,123 +7637,45 @@
+@@ -12139,122 +10037,44 @@
static _TAO_UnionDef_Remote_Proxy_Broker *the_TAO_UnionDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -15121,15 +11942,13 @@
+ static IR_EnumDef_ptr _duplicate (IR_EnumDef_ptr obj);
+ static IR_EnumDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static EnumDef_ptr _nil (void)
@@ -15142,203 +11961,121 @@
static void _tao_any_destructor (void*);
- virtual IR::EnumMemberSeq * members (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_EnumMemberSeq * members (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -12273,8 +7683,8 @@
+@@ -12263,7 +10083,7 @@
));
virtual void members (
- const IR::EnumMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV =
+ const IR_EnumMemberSeq & members,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -12282,131 +7692,39 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -12284,14 +10104,14 @@
_TAO_EnumDef_Proxy_Broker *the_TAO_EnumDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- EnumDef (
-- TAO_Stub *objref,
+ 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 IR_EnumDef_setup_collocation (int collocated);
+
+- EnumDef (
+ IR_EnumDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -12301,10 +10121,10 @@
+ friend class _TAO_EnumDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_EnumDef_Direct_Proxy_Impl;
+
- virtual ~EnumDef (void);
--private:
++ virtual ~IR_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:
++ IR_EnumDef (const IR_EnumDef &);
++ void operator= (const IR_EnumDef &);
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -12314,7 +10134,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_EnumDef;
+
+ friend class _TAO_EnumDef_Remote_Proxy_Impl;
+ friend class _TAO_EnumDef_ThruPOA_Proxy_Impl;
+@@ -12348,15 +10168,15 @@
+ 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
++ void result (IR_EnumMemberSeq * result);
+ // update the result
- IR::EnumMemberSeq * _result;
--};
++ IR_EnumMemberSeq * _result;
+ };
--class TAO_ClientRequestInfo_IR_EnumDef_members_set : public TAO_ClientRequestInfo
--{
--public:
+ class TAO_ClientRequestInfo_IR_EnumDef_members_set : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::EnumDef;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
+@@ -12365,7 +10185,7 @@
+ TAO_ClientRequestInfo_IR_EnumDef_members_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- 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_EnumDef_members_set (const TAO_ClientRequestInfo_IR_EnumDef_members_set &);
-- void operator= (const TAO_ClientRequestInfo_IR_EnumDef_members_set &);
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -12391,7 +10211,7 @@
+ 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 */
--
-+ virtual ~IR_EnumDef (void);
-+private:
-+ IR_EnumDef (const IR_EnumDef &);
-+ void operator= (const IR_EnumDef &);
++ const IR_EnumMemberSeq & members_;
+
};
-
-@@ -12419,13 +7737,13 @@
- // Base Impl. Declaration
+@@ -12410,12 +10230,12 @@
//
--class TAO_IFR_Client_Export _TAO_EnumDef_Proxy_Impl :
+ class TAO_IFR_Client_Export _TAO_EnumDef_Proxy_Impl :
- public virtual IR::_TAO_TypedefDef_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_EnumDef_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
)
-@@ -12433,9 +7751,9 @@
- CORBA::SystemException
- )) = 0;
+@@ -12425,7 +10245,7 @@
-- virtual void members (
-+ 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 ((
-@@ -12446,6 +7764,7 @@
+@@ -12436,6 +10256,7 @@
_TAO_EnumDef_Proxy_Impl (void);
};
@@ -15346,32 +12083,25 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -12455,18 +7774,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_EnumDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_EnumDef_Remote_Proxy_Impl :
+@@ -12448,7 +10269,7 @@
+ class TAO_IFR_Client_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:
- _TAO_EnumDef_Remote_Proxy_Impl (void);
--
-+
+@@ -12456,7 +10277,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
)
-@@ -12476,7 +7795,7 @@
+@@ -12466,7 +10287,7 @@
virtual void members (
CORBA_Object *_collocated_tao_target_,
@@ -15380,24 +12110,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -12491,49 +7810,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_EnumDef_Proxy_Broker
+@@ -12495,8 +10316,9 @@
{
public:
virtual ~_TAO_EnumDef_Proxy_Broker (void);
@@ -15408,48 +12121,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_EnumDef_Proxy_Broker (void);
--
-+
+@@ -12505,6 +10327,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_EnumDef_Remote_Proxy_Broker : public virtual _TAO_EnumDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_EnumDef_Remote_Proxy_Broker (void);
--
-+
+@@ -12522,7 +10345,7 @@
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 ()
);
-@@ -12547,132 +7867,54 @@
+@@ -12536,122 +10359,44 @@
static _TAO_EnumDef_Remote_Proxy_Broker *the_TAO_EnumDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -15552,15 +12247,13 @@
+ static IR_AliasDef_ptr _duplicate (IR_AliasDef_ptr obj);
+ static IR_AliasDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static AliasDef_ptr _nil (void)
@@ -15573,192 +12266,112 @@
static void _tao_any_destructor (void*);
- virtual IR::IDLType_ptr original_type_def (
-- CORBA::Environment &ACE_TRY_ENV =
+ 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
+@@ -12660,7 +10405,7 @@
));
-- virtual void original_type_def (
+ virtual void original_type_def (
- IR::IDLType_ptr original_type_def,
-- CORBA::Environment &ACE_TRY_ENV =
-+ 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 ((
-@@ -12680,131 +7922,39 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -12681,14 +10426,14 @@
_TAO_AliasDef_Proxy_Broker *the_TAO_AliasDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- AliasDef (
-- TAO_Stub *objref,
+ 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 IR_AliasDef_setup_collocation (int collocated);
+
+- AliasDef (
+ IR_AliasDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -12698,10 +10443,10 @@
+ friend class _TAO_AliasDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_AliasDef_Direct_Proxy_Impl;
+
- virtual ~AliasDef (void);
--private:
++ virtual ~IR_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:
++ IR_AliasDef (const IR_AliasDef &);
++ void operator= (const IR_AliasDef &);
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -12711,7 +10456,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_AliasDef;
+
+ friend class _TAO_AliasDef_Remote_Proxy_Impl;
+ friend class _TAO_AliasDef_ThruPOA_Proxy_Impl;
+@@ -12745,15 +10490,15 @@
+ 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
++ void result (IR_IDLType_ptr result);
+ // update the result
- IR::IDLType_ptr _result;
--};
++ IR_IDLType_ptr _result;
+ };
--class TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set : public TAO_ClientRequestInfo
--{
--public:
+ class TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::AliasDef;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
+@@ -12762,7 +10507,7 @@
+ TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- 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_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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -12788,7 +10533,7 @@
+ 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 */
--
-+ virtual ~IR_AliasDef (void);
-+private:
-+ IR_AliasDef (const IR_AliasDef &);
-+ void operator= (const IR_AliasDef &);
++ IR_IDLType_ptr original_type_def_;
+
};
-
-@@ -12817,13 +7967,13 @@
- // Base Impl. Declaration
+@@ -12807,12 +10552,12 @@
//
--class TAO_IFR_Client_Export _TAO_AliasDef_Proxy_Impl :
+ class TAO_IFR_Client_Export _TAO_AliasDef_Proxy_Impl :
- public virtual IR::_TAO_TypedefDef_Proxy_Impl
-+class TAO_IFR_Client_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 (
-+
+ virtual IR_IDLType_ptr original_type_def (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -12833,7 +7983,7 @@
+@@ -12822,7 +10567,7 @@
virtual void original_type_def (
CORBA_Object *_collocated_tao_target_,
@@ -15767,7 +12380,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -12844,6 +7994,7 @@
+@@ -12833,6 +10578,7 @@
_TAO_AliasDef_Proxy_Impl (void);
};
@@ -15775,32 +12388,25 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -12853,18 +8004,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_AliasDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_AliasDef_Remote_Proxy_Impl :
+@@ -12845,7 +10591,7 @@
+ class TAO_IFR_Client_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:
- _TAO_AliasDef_Remote_Proxy_Impl (void);
--
-+
+@@ -12853,7 +10599,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
)
-@@ -12874,7 +8025,7 @@
+@@ -12863,7 +10609,7 @@
virtual void original_type_def (
CORBA_Object *_collocated_tao_target_,
@@ -15809,24 +12415,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -12889,49 +8040,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_AliasDef_Proxy_Broker
+@@ -12892,8 +10638,9 @@
{
public:
virtual ~_TAO_AliasDef_Proxy_Broker (void);
@@ -15837,48 +12426,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_AliasDef_Proxy_Broker (void);
--
-+
+@@ -12902,6 +10649,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_AliasDef_Remote_Proxy_Broker : public virtual _TAO_AliasDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_AliasDef_Remote_Proxy_Broker (void);
--
-+
+@@ -12919,7 +10667,7 @@
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 ()
);
-@@ -12945,163 +8097,77 @@
+@@ -12933,117 +10681,39 @@
static _TAO_AliasDef_Remote_Proxy_Broker *the_TAO_AliasDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -15981,15 +12552,13 @@
+ static IR_NativeDef_ptr _duplicate (IR_NativeDef_ptr obj);
+ static IR_NativeDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static NativeDef_ptr _nil (void)
@@ -16000,89 +12569,47 @@
}
static void _tao_any_destructor (void*);
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -13061,14 +10731,14 @@
_TAO_NativeDef_Proxy_Broker *the_TAO_NativeDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- NativeDef (
-- TAO_Stub *objref,
+ 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 IR_NativeDef_setup_collocation (int collocated);
+
+- NativeDef (
+ IR_NativeDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -13078,10 +10748,10 @@
+ friend class _TAO_NativeDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_NativeDef_Direct_Proxy_Impl;
+
- virtual ~NativeDef (void);
--private:
++ virtual ~IR_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 */
-+ );
-+
-+ 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 &);
- };
-
-@@ -13114,16 +8180,17 @@
- // Base Impl. Declaration
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -13103,7 +10773,7 @@
//
--class TAO_IFR_Client_Export _TAO_NativeDef_Proxy_Impl :
+ class TAO_IFR_Client_Export _TAO_NativeDef_Proxy_Impl :
- public virtual IR::_TAO_TypedefDef_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_NativeDef_Proxy_Impl :
+ public virtual _TAO_TypedefDef_Proxy_Impl
{
public:
virtual ~_TAO_NativeDef_Proxy_Impl (void) { }
--
-- protected:
-+
-+protected:
+@@ -13112,6 +10782,7 @@
_TAO_NativeDef_Proxy_Impl (void);
};
@@ -16090,49 +12617,16 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -13133,18 +8200,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_NativeDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_NativeDef_Remote_Proxy_Impl :
+@@ -13124,7 +10795,7 @@
+ class TAO_IFR_Client_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:
- _TAO_NativeDef_Remote_Proxy_Impl (void);
--
-+
- virtual ~_TAO_NativeDef_Remote_Proxy_Impl (void) { }
--
-- };
-+
-+};
-
- //
- // Base Proxy Impl. Declaration
-@@ -13152,179 +8219,102 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_NativeDef_Proxy_Broker
+@@ -13154,8 +10825,9 @@
{
public:
virtual ~_TAO_NativeDef_Proxy_Broker (void);
@@ -16143,66 +12637,33 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_NativeDef_Proxy_Broker (void);
--
-+
+@@ -13164,6 +10836,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_NativeDef_Remote_Proxy_Broker : public virtual _TAO_NativeDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_NativeDef_Remote_Proxy_Broker (void);
--
-+
+@@ -13181,7 +10854,7 @@
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
-+};
-+
-+// This funxtion is used to get an handle to the unique instance
- // of the Remote Proxy Broker that is available for a given
- // interface.
+@@ -13195,122 +10868,44 @@
+ static _TAO_NativeDef_Remote_Proxy_Broker *the_TAO_NativeDef_Remote_Proxy_Broker (void);
+ };
--public:
-- static _TAO_NativeDef_Remote_Proxy_Broker *the_TAO_NativeDef_Remote_Proxy_Broker (void);
--};
-
-+_TAO_NativeDef_Remote_Proxy_Broker *the_TAO_NativeDef_Remote_Proxy_Broker (void);
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // 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;
-
+-
-#endif /* end #if !defined */
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_NativeDef;
@@ -16279,26 +12740,22 @@
-#if !defined (_IR_PRIMITIVEDEF_CH_)
-#define _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;
--
+ // 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_IFR_Client_Export PrimitiveDef: public virtual IDLType
--{
--public:
--#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
++class TAO_IFR_Client_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;
--#endif /* ! __GNUC__ || g++ >= 2.8 */
-+class TAO_IFR_Client_Export IR_PrimitiveDef: public virtual IR_IDLType
-+{
-+public:
-+#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+ typedef IR_PrimitiveDef_ptr _ptr_type;
+ typedef IR_PrimitiveDef_var _var_type;
-+#endif /* ! __GNUC__ || g++ >= 2.8 */
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
// the static operations
- static PrimitiveDef_ptr _duplicate (PrimitiveDef_ptr obj);
@@ -16306,15 +12763,13 @@
+ static IR_PrimitiveDef_ptr _duplicate (IR_PrimitiveDef_ptr obj);
+ static IR_PrimitiveDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static PrimitiveDef_ptr _nil (void)
@@ -16327,141 +12782,78 @@
static void _tao_any_destructor (void*);
- virtual IR::PrimitiveKind kind (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_PrimitiveKind kind (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -13332,89 +8322,39 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -13331,14 +10926,14 @@
_TAO_PrimitiveDef_Proxy_Broker *the_TAO_PrimitiveDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- PrimitiveDef (
-- TAO_Stub *objref,
+ 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 IR_PrimitiveDef_setup_collocation (int collocated);
+
+- PrimitiveDef (
+ IR_PrimitiveDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -13348,10 +10943,10 @@
+ friend class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_PrimitiveDef_Direct_Proxy_Impl;
+
- virtual ~PrimitiveDef (void);
--private:
++ virtual ~IR_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:
++ IR_PrimitiveDef (const IR_PrimitiveDef &);
++ void operator= (const IR_PrimitiveDef &);
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -13361,7 +10956,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_PrimitiveDef;
+
+ friend class _TAO_PrimitiveDef_Remote_Proxy_Impl;
+ friend class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl;
+@@ -13395,9 +10990,9 @@
+ 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
++ void result (IR_PrimitiveKind result);
+ // update the result
- IR::PrimitiveKind _result;
--};
-
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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 &);
++ IR_PrimitiveKind _result;
};
-
-@@ -13427,13 +8367,13 @@
- // Base Impl. Declaration
+ #endif /* TAO_HAS_INTERCEPTORS */
+@@ -13415,12 +11010,12 @@
//
--class TAO_IFR_Client_Export _TAO_PrimitiveDef_Proxy_Impl :
+ class TAO_IFR_Client_Export _TAO_PrimitiveDef_Proxy_Impl :
- public virtual IR::_TAO_IDLType_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_PrimitiveDef_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
)
-@@ -13445,6 +8385,7 @@
+@@ -13432,6 +11027,7 @@
_TAO_PrimitiveDef_Proxy_Impl (void);
};
@@ -16469,49 +12861,25 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -13454,18 +8395,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_PrimitiveDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_PrimitiveDef_Remote_Proxy_Impl :
+@@ -13444,7 +11040,7 @@
+ class TAO_IFR_Client_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:
- _TAO_PrimitiveDef_Remote_Proxy_Impl (void);
--
-+
+@@ -13452,7 +11048,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
)
-@@ -13481,49 +8422,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_PrimitiveDef_Proxy_Broker
+@@ -13482,8 +11078,9 @@
{
public:
virtual ~_TAO_PrimitiveDef_Proxy_Broker (void);
@@ -16522,48 +12890,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_PrimitiveDef_Proxy_Broker (void);
--
-+
+@@ -13492,6 +11089,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_PrimitiveDef_Remote_Proxy_Broker : public virtual _TAO_PrimitiveDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_PrimitiveDef_Remote_Proxy_Broker (void);
--
-+
+@@ -13509,7 +11107,7 @@
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 ()
);
-@@ -13537,123 +8479,45 @@
+@@ -13523,117 +11121,39 @@
static _TAO_PrimitiveDef_Remote_Proxy_Broker *the_TAO_PrimitiveDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -16666,15 +13016,13 @@
+ static IR_StringDef_ptr _duplicate (IR_StringDef_ptr obj);
+ static IR_StringDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static StringDef_ptr _nil (void)
@@ -16685,190 +13033,65 @@
}
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 ((
-@@ -13662,7 +8526,7 @@
-
- virtual void bound (
- CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -13670,131 +8534,39 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -13668,14 +11188,14 @@
_TAO_StringDef_Proxy_Broker *the_TAO_StringDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- StringDef (
-- TAO_Stub *objref,
+ 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 IR_StringDef_setup_collocation (int collocated);
+
+- StringDef (
+ IR_StringDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -13685,10 +11205,10 @@
+ friend class _TAO_StringDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_StringDef_Direct_Proxy_Impl;
+
- virtual ~StringDef (void);
--private:
++ virtual ~IR_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
--};
++ IR_StringDef (const IR_StringDef &);
++ void operator= (const IR_StringDef &);
--class TAO_ClientRequestInfo_IR_StringDef_bound_set : public TAO_ClientRequestInfo
--{
--public:
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -13698,7 +11218,7 @@
+ class TAO_ClientRequestInfo_IR_StringDef_bound_get : public TAO_ClientRequestInfo
+ {
+ public:
+- friend class IR::StringDef;
++ friend class IR_StringDef;
+
+ friend class _TAO_StringDef_Remote_Proxy_Impl;
+ friend class _TAO_StringDef_ThruPOA_Proxy_Impl;
+@@ -13740,7 +11260,7 @@
+ class TAO_ClientRequestInfo_IR_StringDef_bound_set : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::StringDef;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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_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 */
--
-+ virtual ~IR_StringDef (void);
-+private:
-+ IR_StringDef (const IR_StringDef &);
-+ void operator= (const IR_StringDef &);
- };
-
-
-@@ -13807,13 +8579,13 @@
- // Base Impl. Declaration
+@@ -13794,7 +11314,7 @@
//
--class TAO_IFR_Client_Export _TAO_StringDef_Proxy_Impl :
+ class TAO_IFR_Client_Export _TAO_StringDef_Proxy_Impl :
- public virtual IR::_TAO_IDLType_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_StringDef_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
- )
-@@ -13834,6 +8606,7 @@
+@@ -13820,6 +11340,7 @@
_TAO_StringDef_Proxy_Impl (void);
};
@@ -16876,49 +13099,16 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -13843,18 +8616,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_StringDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_StringDef_Remote_Proxy_Impl :
+@@ -13832,7 +11353,7 @@
+ class TAO_IFR_Client_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:
- _TAO_StringDef_Remote_Proxy_Impl (void);
--
-+
- 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
- )
-@@ -13879,49 +8652,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_StringDef_Proxy_Broker
+@@ -13879,8 +11400,9 @@
{
public:
virtual ~_TAO_StringDef_Proxy_Broker (void);
@@ -16929,48 +13119,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_StringDef_Proxy_Broker (void);
--
-+
+@@ -13889,6 +11411,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_StringDef_Remote_Proxy_Broker : public virtual _TAO_StringDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_StringDef_Remote_Proxy_Broker (void);
--
-+
+@@ -13906,7 +11429,7 @@
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 ()
);
-@@ -13935,123 +8709,45 @@
+@@ -13920,117 +11443,39 @@
static _TAO_StringDef_Remote_Proxy_Broker *the_TAO_StringDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -17073,15 +13245,13 @@
+ static IR_WstringDef_ptr _duplicate (IR_WstringDef_ptr obj);
+ static IR_WstringDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static WstringDef_ptr _nil (void)
@@ -17092,193 +13262,65 @@
}
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 ((
-@@ -14060,7 +8756,7 @@
-
- virtual void bound (
- CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -14068,131 +8764,39 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -14065,14 +11510,14 @@
_TAO_WstringDef_Proxy_Broker *the_TAO_WstringDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- WstringDef (
-- TAO_Stub *objref,
+ 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 IR_WstringDef_setup_collocation (int collocated);
+
+- WstringDef (
+ IR_WstringDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -14082,10 +11527,10 @@
+ friend class _TAO_WstringDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_WstringDef_Direct_Proxy_Impl;
+
- virtual ~WstringDef (void);
--private:
++ virtual ~IR_WstringDef (void);
+ private:
- WstringDef (const WstringDef &);
- void operator= (const 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
--};
++ IR_WstringDef (const IR_WstringDef &);
++ void operator= (const IR_WstringDef &);
--class TAO_ClientRequestInfo_IR_WstringDef_bound_set : public TAO_ClientRequestInfo
--{
--public:
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -14095,7 +11540,7 @@
+ class TAO_ClientRequestInfo_IR_WstringDef_bound_get : public TAO_ClientRequestInfo
+ {
+ public:
+- friend class IR::WstringDef;
++ friend class IR_WstringDef;
+
+ friend class _TAO_WstringDef_Remote_Proxy_Impl;
+ friend class _TAO_WstringDef_ThruPOA_Proxy_Impl;
+@@ -14137,7 +11582,7 @@
+ class TAO_ClientRequestInfo_IR_WstringDef_bound_set : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::WstringDef;
--
++ 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_set (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 */
--
-+ virtual ~IR_WstringDef (void);
-+private:
-+ IR_WstringDef (const IR_WstringDef &);
-+ void operator= (const IR_WstringDef &);
- };
-
-
-@@ -14205,15 +8809,15 @@
- // Base Impl. Declaration
+@@ -14191,7 +11636,7 @@
//
--class TAO_IFR_Client_Export _TAO_WstringDef_Proxy_Impl :
+ class TAO_IFR_Client_Export _TAO_WstringDef_Proxy_Impl :
- public virtual IR::_TAO_IDLType_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_WstringDef_Proxy_Impl :
+ public virtual _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
-@@ -14232,6 +8836,7 @@
+@@ -14217,6 +11662,7 @@
_TAO_WstringDef_Proxy_Impl (void);
};
@@ -17286,49 +13328,16 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -14241,18 +8846,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_WstringDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_WstringDef_Remote_Proxy_Impl :
+@@ -14229,7 +11675,7 @@
+ class TAO_IFR_Client_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:
- _TAO_WstringDef_Remote_Proxy_Impl (void);
--
-+
- 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
- )
-@@ -14277,49 +8882,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_WstringDef_Proxy_Broker
+@@ -14276,8 +11722,9 @@
{
public:
virtual ~_TAO_WstringDef_Proxy_Broker (void);
@@ -17339,48 +13348,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_WstringDef_Proxy_Broker (void);
--
-+
+@@ -14286,6 +11733,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_WstringDef_Remote_Proxy_Broker : public virtual _TAO_WstringDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_WstringDef_Remote_Proxy_Broker (void);
--
-+
+@@ -14303,7 +11751,7 @@
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 ()
);
-@@ -14333,123 +8939,45 @@
+@@ -14317,117 +11765,39 @@
static _TAO_WstringDef_Remote_Proxy_Broker *the_TAO_WstringDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -17483,15 +13474,13 @@
+ static IR_FixedDef_ptr _duplicate (IR_FixedDef_ptr obj);
+ static IR_FixedDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static FixedDef_ptr _nil (void)
@@ -17502,292 +13491,83 @@
}
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 ((
-@@ -14458,7 +8986,7 @@
-
- virtual void digits (
- CORBA::UShort digits,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -14466,7 +8994,7 @@
- ));
-
- virtual CORBA::Short scale (
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -14475,7 +9003,7 @@
-
- virtual void scale (
- CORBA::Short scale,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -14483,215 +9011,39 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -14479,14 +11849,14 @@
_TAO_FixedDef_Proxy_Broker *the_TAO_FixedDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- FixedDef (
-- TAO_Stub *objref,
+ 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 IR_FixedDef_setup_collocation (int collocated);
+
+- FixedDef (
+ IR_FixedDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -14496,10 +11866,10 @@
+ friend class _TAO_FixedDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_FixedDef_Direct_Proxy_Impl;
+
- virtual ~FixedDef (void);
--private:
++ virtual ~IR_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:
++ IR_FixedDef (const IR_FixedDef &);
++ void operator= (const IR_FixedDef &);
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -14509,7 +11879,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
+@@ -14551,7 +11921,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
+@@ -14593,7 +11963,7 @@
+ class TAO_ClientRequestInfo_IR_FixedDef_scale_get : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::FixedDef;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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_FixedDef (void);
- 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:
+@@ -14635,7 +12005,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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));
--
--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 &);
- };
-
-
-@@ -14704,13 +9056,13 @@
- // Base Impl. Declaration
++ friend class IR_FixedDef;
+
+ friend class _TAO_FixedDef_Remote_Proxy_Impl;
+ friend class _TAO_FixedDef_ThruPOA_Proxy_Impl;
+@@ -14689,7 +12059,7 @@
//
--class TAO_IFR_Client_Export _TAO_FixedDef_Proxy_Impl :
+ class TAO_IFR_Client_Export _TAO_FixedDef_Proxy_Impl :
- public virtual IR::_TAO_IDLType_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_FixedDef_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
- )
-@@ -14748,6 +9100,7 @@
+@@ -14732,6 +12102,7 @@
_TAO_FixedDef_Proxy_Impl (void);
};
@@ -17795,49 +13575,16 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -14757,18 +9110,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_FixedDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_FixedDef_Remote_Proxy_Impl :
+@@ -14744,7 +12115,7 @@
+ class TAO_IFR_Client_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:
- _TAO_FixedDef_Remote_Proxy_Impl (void);
--
-+
- 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
- )
-@@ -14810,49 +9163,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_FixedDef_Proxy_Broker
+@@ -14808,8 +12179,9 @@
{
public:
virtual ~_TAO_FixedDef_Proxy_Broker (void);
@@ -17848,48 +13595,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_FixedDef_Proxy_Broker (void);
--
-+
+@@ -14818,6 +12190,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_FixedDef_Remote_Proxy_Broker : public virtual _TAO_FixedDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_FixedDef_Remote_Proxy_Broker (void);
--
-+
+@@ -14835,7 +12208,7 @@
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 ()
);
-@@ -14866,123 +9220,45 @@
+@@ -14849,117 +12222,39 @@
static _TAO_FixedDef_Remote_Proxy_Broker *the_TAO_FixedDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -17992,15 +13721,13 @@
+ static IR_SequenceDef_ptr _duplicate (IR_SequenceDef_ptr obj);
+ static IR_SequenceDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static SequenceDef_ptr _nil (void)
@@ -18011,345 +13738,138 @@
}
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 ((
-@@ -14991,7 +9267,7 @@
-
- virtual void bound (
- CORBA::ULong bound,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -14999,15 +9275,15 @@
- ));
-
- virtual CORBA::TypeCode_ptr element_type (
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
+@@ -14989,7 +12284,7 @@
CORBA::SystemException
));
- virtual IR::IDLType_ptr element_type_def (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_IDLType_ptr element_type_def (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -15015,8 +9291,8 @@
+@@ -14998,7 +12293,7 @@
));
virtual void element_type_def (
- IR::IDLType_ptr element_type_def,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_IDLType_ptr element_type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -15024,257 +9300,39 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -15019,14 +12314,14 @@
_TAO_SequenceDef_Proxy_Broker *the_TAO_SequenceDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- SequenceDef (
-- TAO_Stub *objref,
+ 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 IR_SequenceDef_setup_collocation (int collocated);
+
+- SequenceDef (
+ IR_SequenceDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -15036,10 +12331,10 @@
+ friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_SequenceDef_Direct_Proxy_Impl;
+
- virtual ~SequenceDef (void);
--private:
++ virtual ~IR_SequenceDef (void);
+ private:
- SequenceDef (const SequenceDef &);
- void operator= (const 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:
++ IR_SequenceDef (const IR_SequenceDef &);
++ void operator= (const IR_SequenceDef &);
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -15049,7 +12344,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
+@@ -15091,7 +12386,7 @@
+ 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;
--
--TAO_ClientRequestInfo_IR_SequenceDef_bound_set (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
+@@ -15133,7 +12428,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
+@@ -15175,7 +12470,7 @@
+ class TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::SequenceDef;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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_SequenceDef (void);
+@@ -15209,15 +12504,15 @@
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 &);
+ 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
++ 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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_SequenceDef;
+
+ friend class _TAO_SequenceDef_Remote_Proxy_Impl;
+ friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
+@@ -15226,7 +12521,7 @@
+ TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -15252,7 +12547,7 @@
+ 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 */
--
-+ IR_SequenceDef (const IR_SequenceDef &);
-+ void operator= (const IR_SequenceDef &);
++ IR_IDLType_ptr element_type_def_;
+
};
-
-@@ -15287,13 +9345,13 @@
- // Base Impl. Declaration
+@@ -15271,7 +12566,7 @@
//
--class TAO_IFR_Client_Export _TAO_SequenceDef_Proxy_Impl :
+ class TAO_IFR_Client_Export _TAO_SequenceDef_Proxy_Impl :
- public virtual IR::_TAO_IDLType_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_SequenceDef_Proxy_Impl :
+ public virtual _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
- )
-@@ -15318,7 +9376,7 @@
+@@ -15301,7 +12596,7 @@
CORBA::SystemException
)) = 0;
@@ -18358,19 +13878,16 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -15326,9 +9384,9 @@
- CORBA::SystemException
- )) = 0;
+@@ -15311,7 +12606,7 @@
-- virtual void element_type_def (
-+ 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 ((
-@@ -15339,6 +9397,8 @@
+@@ -15322,6 +12617,8 @@
_TAO_SequenceDef_Proxy_Impl (void);
};
@@ -18379,41 +13896,16 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -15348,18 +9408,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_SequenceDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_SequenceDef_Remote_Proxy_Impl :
+@@ -15334,7 +12631,7 @@
+ class TAO_IFR_Client_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:
- _TAO_SequenceDef_Remote_Proxy_Impl (void);
--
-+
- 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
- )
-@@ -15376,7 +9436,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
- )
-@@ -15384,7 +9444,7 @@
+@@ -15367,7 +12664,7 @@
CORBA::SystemException
));
@@ -18422,7 +13914,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -15394,7 +9454,7 @@
+@@ -15377,7 +12674,7 @@
virtual void element_type_def (
CORBA_Object *_collocated_tao_target_,
@@ -18431,24 +13923,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -15409,49 +9469,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_SequenceDef_Proxy_Broker
+@@ -15406,8 +12703,9 @@
{
public:
virtual ~_TAO_SequenceDef_Proxy_Broker (void);
@@ -18459,48 +13934,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_SequenceDef_Proxy_Broker (void);
--
-+
+@@ -15416,6 +12714,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_SequenceDef_Remote_Proxy_Broker : public virtual _TAO_SequenceDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_SequenceDef_Remote_Proxy_Broker (void);
--
-+
+@@ -15433,7 +12732,7 @@
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 ()
);
-@@ -15465,123 +9526,45 @@
+@@ -15447,117 +12746,39 @@
static _TAO_SequenceDef_Remote_Proxy_Broker *the_TAO_SequenceDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -18603,15 +14060,13 @@
+ static IR_ArrayDef_ptr _duplicate (IR_ArrayDef_ptr obj);
+ static IR_ArrayDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static ArrayDef_ptr _nil (void)
@@ -18622,397 +14077,147 @@
}
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 ((
-@@ -15590,7 +9573,7 @@
-
- virtual void length (
- CORBA::ULong length,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -15598,15 +9581,15 @@
- ));
-
- virtual CORBA::TypeCode_ptr element_type (
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
+@@ -15587,7 +12808,7 @@
CORBA::SystemException
));
- virtual IR::IDLType_ptr element_type_def (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_IDLType_ptr element_type_def (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -15614,8 +9597,8 @@
+@@ -15596,7 +12817,7 @@
));
virtual void element_type_def (
- IR::IDLType_ptr element_type_def,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_IDLType_ptr element_type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -15623,291 +9606,73 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -15617,14 +12838,14 @@
_TAO_ArrayDef_Proxy_Broker *the_TAO_ArrayDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- ArrayDef (
-- TAO_Stub *objref,
+ 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 IR_ArrayDef_setup_collocation (int collocated);
+
+- ArrayDef (
+ IR_ArrayDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -15634,10 +12855,10 @@
+ friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ArrayDef_Direct_Proxy_Impl;
+
- virtual ~ArrayDef (void);
--private:
++ virtual ~IR_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
--};
++ IR_ArrayDef (const IR_ArrayDef &);
++ void operator= (const IR_ArrayDef &);
--class TAO_ClientRequestInfo_IR_ArrayDef_length_set : public TAO_ClientRequestInfo
--{
--public:
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -15647,7 +12868,7 @@
+ class TAO_ClientRequestInfo_IR_ArrayDef_length_get : public TAO_ClientRequestInfo
+ {
+ public:
+- friend class IR::ArrayDef;
++ friend class IR_ArrayDef;
+
+ friend class _TAO_ArrayDef_Remote_Proxy_Impl;
+ friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
+@@ -15689,7 +12910,7 @@
+ class TAO_ClientRequestInfo_IR_ArrayDef_length_set : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::ArrayDef;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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));
--
-+ virtual ~IR_ArrayDef (void);
- 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_;
--
-+ IR_ArrayDef (const IR_ArrayDef &);
-+ void operator= (const IR_ArrayDef &);
- };
-
--class TAO_ClientRequestInfo_IR_ArrayDef_element_type_get : public TAO_ClientRequestInfo
--{
--public:
+@@ -15731,7 +12952,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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));
-+// 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_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;
--};
-+///////////////////////////////////////////////////////////////////////
-+// Base Impl. Declaration
-+//
-
--class TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get : public TAO_ClientRequestInfo
-+class TAO_IFR_Client_Export _TAO_ArrayDef_Proxy_Impl :
-+ public virtual _TAO_IDLType_Proxy_Impl
++ friend class IR_ArrayDef;
+
+ friend class _TAO_ArrayDef_Remote_Proxy_Impl;
+ friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
+@@ -15773,7 +12994,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual ~_TAO_ArrayDef_Proxy_Impl (void) { }
-
--virtual Dynamic::ParameterList * arguments (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
-+ virtual CORBA::ULong length (
-+ 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 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 &);
++ friend class IR_ArrayDef;
+
+ friend class _TAO_ArrayDef_Remote_Proxy_Impl;
+ friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
+@@ -15807,15 +13028,15 @@
+ 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
++ 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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_ArrayDef;
+
+ friend class _TAO_ArrayDef_Remote_Proxy_Impl;
+ friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
+@@ -15824,7 +13045,7 @@
+ TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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_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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -15850,7 +13071,7 @@
+ 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 */
--
--};
--
--
--// The Proxy Implementations are used by each interface to
--// perform a call. Each different implementation encapsulate
--// an invocation logics.
--
--
--///////////////////////////////////////////////////////////////////////
--// Base Impl. Declaration
--//
--
--class TAO_IFR_Client_Export _TAO_ArrayDef_Proxy_Impl :
++ IR_IDLType_ptr element_type_def_;
+
+ };
+
+@@ -15869,7 +13090,7 @@
+ //
+
+ class TAO_IFR_Client_Export _TAO_ArrayDef_Proxy_Impl :
- public virtual IR::_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;
--
-- virtual void length (
-- CORBA_Object *_collocated_tao_target_,
-- CORBA::ULong length,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
-+ virtual void length (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::ULong length,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
- virtual CORBA::TypeCode_ptr element_type (
- CORBA_Object *_collocated_tao_target_,
-@@ -15917,9 +9682,9 @@
++ public virtual _TAO_IDLType_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_ArrayDef_Proxy_Impl (void) { }
+@@ -15899,7 +13120,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
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
-@@ -15927,7 +9692,7 @@
+@@ -15909,7 +13130,7 @@
virtual void element_type_def (
CORBA_Object *_collocated_tao_target_,
@@ -19021,7 +14226,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -15938,6 +9703,7 @@
+@@ -15920,6 +13141,7 @@
_TAO_ArrayDef_Proxy_Impl (void);
};
@@ -19029,81 +14234,34 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -15947,18 +9713,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_ArrayDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_ArrayDef_Remote_Proxy_Impl :
+@@ -15932,7 +13154,7 @@
+ class TAO_IFR_Client_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:
- _TAO_ArrayDef_Remote_Proxy_Impl (void);
--
-+
- 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
- )
-@@ -15975,25 +9741,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 ((
+@@ -15965,7 +13187,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
-+ CORBA::Environment &ACE_TRY_ENV
+ CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
+@@ -15975,7 +13197,7 @@
-- virtual void element_type_def (
-+ 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 ((
-@@ -16008,49 +9774,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ArrayDef_Proxy_Broker
+@@ -16004,8 +13226,9 @@
{
public:
virtual ~_TAO_ArrayDef_Proxy_Broker (void);
@@ -19114,48 +14272,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_ArrayDef_Proxy_Broker (void);
--
-+
+@@ -16014,6 +13237,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ArrayDef_Remote_Proxy_Broker : public virtual _TAO_ArrayDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_ArrayDef_Remote_Proxy_Broker (void);
--
-+
+@@ -16031,7 +13255,7 @@
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 ()
);
-@@ -16064,131 +9831,55 @@
+@@ -16045,117 +13269,41 @@
static _TAO_ArrayDef_Remote_Proxy_Broker *the_TAO_ArrayDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -19260,15 +14400,13 @@
+ static IR_ExceptionDef_ptr _duplicate (IR_ExceptionDef_ptr obj);
+ static IR_ExceptionDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static ExceptionDef_ptr _nil (void)
@@ -19279,267 +14417,140 @@
}
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 ((
+@@ -16168,7 +13316,7 @@
CORBA::SystemException
));
- virtual IR::StructMemberSeq * members (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_StructMemberSeq * members (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -16196,8 +9887,8 @@
+@@ -16177,7 +13325,7 @@
));
virtual void members (
- const IR::StructMemberSeq & members,
-- CORBA::Environment &ACE_TRY_ENV =
+ const IR_StructMemberSeq & members,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -16205,173 +9896,39 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -16198,14 +13346,14 @@
_TAO_ExceptionDef_Proxy_Broker *the_TAO_ExceptionDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- ExceptionDef (
-- TAO_Stub *objref,
+ 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 IR_ExceptionDef_setup_collocation (int collocated);
+
+- ExceptionDef (
+ IR_ExceptionDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -16215,10 +13363,10 @@
+ friend class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ExceptionDef_Direct_Proxy_Impl;
+
- virtual ~ExceptionDef (void);
--private:
++ virtual ~IR_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
--};
++ IR_ExceptionDef (const IR_ExceptionDef &);
++ void operator= (const IR_ExceptionDef &);
--class TAO_ClientRequestInfo_IR_ExceptionDef_members_get : public TAO_ClientRequestInfo
--{
--public:
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -16228,7 +13376,7 @@
+ class TAO_ClientRequestInfo_IR_ExceptionDef_type_get : public TAO_ClientRequestInfo
+ {
+ public:
+- friend class IR::ExceptionDef;
++ friend class IR_ExceptionDef;
+
+ friend class _TAO_ExceptionDef_Remote_Proxy_Impl;
+ friend class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
+@@ -16270,7 +13418,7 @@
+ class TAO_ClientRequestInfo_IR_ExceptionDef_members_get : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::ExceptionDef;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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_ExceptionDef (void);
+@@ -16304,15 +13452,15 @@
private:
-- TAO_ClientRequestInfo_IR_ExceptionDef_members_get (const TAO_ClientRequestInfo_IR_ExceptionDef_members_get &);
-- void operator= (const TAO_ClientRequestInfo_IR_ExceptionDef_members_get &);
+ 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
++ void result (IR_StructMemberSeq * result);
+ // update the result
- IR::StructMemberSeq * _result;
--};
--
--class TAO_ClientRequestInfo_IR_ExceptionDef_members_set : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_ExceptionDef;
+
+ friend class _TAO_ExceptionDef_Remote_Proxy_Impl;
+ friend class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
+@@ -16321,7 +13469,7 @@
+ TAO_ClientRequestInfo_IR_ExceptionDef_members_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -16347,7 +13495,7 @@
+ 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 */
--
-+ IR_ExceptionDef (const IR_ExceptionDef &);
-+ void operator= (const IR_ExceptionDef &);
++ const IR_StructMemberSeq & members_;
+
};
-
-@@ -16384,14 +9941,14 @@
- // Base Impl. Declaration
+@@ -16366,8 +13514,8 @@
//
--class TAO_IFR_Client_Export _TAO_ExceptionDef_Proxy_Impl :
+ class TAO_IFR_Client_Export _TAO_ExceptionDef_Proxy_Impl :
- public virtual IR::_TAO_Contained_Proxy_Impl,
- public virtual IR::_TAO_Container_Proxy_Impl
-+class TAO_IFR_Client_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 (
-+
-+ virtual CORBA::TypeCode_ptr type (
- CORBA_Object *_collocated_tao_target_,
- CORBA::Environment &ACE_TRY_ENV
- )
-@@ -16399,17 +9956,17 @@
+@@ -16380,7 +13528,7 @@
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
+ CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+@@ -16390,7 +13538,7 @@
-- virtual void members (
-+ 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 ((
-@@ -16420,6 +9977,7 @@
+@@ -16401,6 +13549,7 @@
_TAO_ExceptionDef_Proxy_Impl (void);
};
@@ -19547,34 +14558,18 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -16429,19 +9987,19 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_ExceptionDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_ExceptionDef_Remote_Proxy_Impl :
+@@ -16413,8 +13562,8 @@
+ class TAO_IFR_Client_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:
- _TAO_ExceptionDef_Remote_Proxy_Impl (void);
--
-+
- 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
- )
-@@ -16449,7 +10007,7 @@
+@@ -16430,7 +13579,7 @@
CORBA::SystemException
));
@@ -19583,7 +14578,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -16459,7 +10017,7 @@
+@@ -16440,7 +13589,7 @@
virtual void members (
CORBA_Object *_collocated_tao_target_,
@@ -19592,24 +14587,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -16474,49 +10032,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ExceptionDef_Proxy_Broker
+@@ -16469,8 +13618,9 @@
{
public:
virtual ~_TAO_ExceptionDef_Proxy_Broker (void);
@@ -19620,48 +14598,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_ExceptionDef_Proxy_Broker (void);
--
-+
+@@ -16479,6 +13629,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ExceptionDef_Remote_Proxy_Broker : public virtual _TAO_ExceptionDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_ExceptionDef_Remote_Proxy_Broker (void);
--
-+
+@@ -16496,7 +13647,7 @@
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 ()
);
-@@ -16530,24 +10089,15 @@
+@@ -16510,24 +13661,15 @@
static _TAO_ExceptionDef_Remote_Proxy_Broker *the_TAO_ExceptionDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -19682,7 +14642,7 @@
#endif /* ! __GNUC__ || g++ >= 2.8 */
static void _tao_any_destructor (void*);
-@@ -16559,482 +10109,383 @@
+@@ -16539,61 +13681,55 @@
CORBA::TypeCode_var type;
};
@@ -19694,73 +14654,58 @@
- ExceptionDescription_var (ExceptionDescription *);
- ExceptionDescription_var (const ExceptionDescription_var &); // copy constructor
- ~ExceptionDescription_var (void); // destructor
--
++ 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
+
- ExceptionDescription_var &operator= (ExceptionDescription *);
- ExceptionDescription_var &operator= (const ExceptionDescription_var &);
- ExceptionDescription *operator-> (void);
- const ExceptionDescription *operator-> (void) const;
--
++ 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 ExceptionDescription &() const;
- operator ExceptionDescription &();
- operator ExceptionDescription &() const;
- operator ExceptionDescription *&(); // variable-size types only
--
-- // in, inout, out, _retn
++ 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;
--
--private:
-- ExceptionDescription *ptr_;
--};
--
--class TAO_IFR_Client_Export 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_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 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_;
-- // assignment from T_var not allowed
-- void operator= (const ExceptionDescription_var &);
+- ExceptionDescription *ptr_;
+ IR_ExceptionDescription *ptr_;
};
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExceptionDescription;
+-class TAO_IFR_Client_Export ExceptionDescription_out
+class TAO_IFR_Client_Export IR_ExceptionDescription_out
-+{
-+public:
+ {
+ 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 &);
@@ -19769,25 +14714,27 @@
+ operator IR_ExceptionDescription *&();
+ IR_ExceptionDescription *&ptr (void);
+ IR_ExceptionDescription *operator-> (void);
-
-+private:
+
+ private:
+- ExceptionDescription *&ptr_;
+ IR_ExceptionDescription *&ptr_;
-+ // assignment from T_var not allowed
+ // 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_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CH_
-
+-
class _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
- // = Initialization and termination methods.
--
-+
- _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (void);
+@@ -16603,19 +13739,19 @@
_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
@@ -19813,28 +14760,21 @@
virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
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;
--
-- };
+@@ -16627,125 +13763,94 @@
+
+ };
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
--
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_EXCEPTIONDEFSEQ_CH_)
-#define _IR_EXCEPTIONDEFSEQ_CH_
-+ };
-
+-
-class ExceptionDefSeq;
-class ExceptionDefSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// ExceptionDefSeq
+// IR_ExceptionDefSeq
@@ -19846,22 +14786,19 @@
_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Object_Sequence<ExceptionDef,ExceptionDef_var>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Object_Sequence<IR_ExceptionDef,IR_ExceptionDef_var>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- ExceptionDefSeq (void); // default ctor
- ExceptionDefSeq (CORBA::ULong max); // uses max size
- ExceptionDefSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- ExceptionDef_ptr *buffer,
+ IR_ExceptionDefSeq (void); // default ctor
+ IR_ExceptionDefSeq (CORBA::ULong max); // uses max size
+ IR_ExceptionDefSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- ExceptionDef_ptr *buffer,
+ IR_ExceptionDef_ptr *buffer,
CORBA::Boolean release = 0
);
@@ -19897,59 +14834,56 @@
- 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);
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- ExceptionDefSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ TAO_Object_Manager<IR_ExceptionDef, IR_ExceptionDef_var> operator[] (CORBA::ULong index);
-
-+ // in, inout, out, _retn
+ const IR_ExceptionDefSeq &in (void) const;
+ IR_ExceptionDefSeq &inout (void);
+ IR_ExceptionDefSeq *&out (void);
+ IR_ExceptionDefSeq *_retn (void);
+ IR_ExceptionDefSeq *ptr (void) const;
--#if !defined (_IR_EXCEPTIONDEFSEQ___OUT_CH_)
--#define _IR_EXCEPTIONDEFSEQ___OUT_CH_
-+private:
+ private:
+- ExceptionDefSeq *ptr_;
+ IR_ExceptionDefSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_EXCEPTIONDEFSEQ___OUT_CH_)
+-#define _IR_EXCEPTIONDEFSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export ExceptionDefSeq_out
+class TAO_IFR_Client_Export IR_ExceptionDefSeq_out
{
@@ -19963,7 +14897,6 @@
- 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 &);
@@ -19973,7 +14906,7 @@
+ 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_;
@@ -19989,19 +14922,15 @@
-
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
+
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CH_
-
+-
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);
+@@ -16755,252 +13860,190 @@
+ _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum,
CORBA::ULong length,
- ExceptionDescription *data,
@@ -20023,10 +14952,9 @@
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,
@@ -20039,15 +14967,14 @@
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
--
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_EXCDESCRIPTIONSEQ_CH_)
-#define _IR_EXCDESCRIPTIONSEQ_CH_
-
-class ExcDescriptionSeq;
-class ExcDescriptionSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// ExcDescriptionSeq
+// IR_ExcDescriptionSeq
@@ -20059,22 +14986,19 @@
_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Sequence<ExceptionDescription>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Sequence<IR_ExceptionDescription>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- ExcDescriptionSeq (void); // default ctor
- ExcDescriptionSeq (CORBA::ULong max); // uses max size
- ExcDescriptionSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- ExceptionDescription *buffer,
+ IR_ExcDescriptionSeq (void); // default ctor
+ IR_ExcDescriptionSeq (CORBA::ULong max); // uses max size
+ IR_ExcDescriptionSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- ExceptionDescription *buffer,
+ IR_ExceptionDescription *buffer,
CORBA::Boolean release = 0
);
@@ -20110,61 +15034,58 @@
- 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;
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- ExcDescriptionSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ 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);
+ IR_ExcDescriptionSeq *_retn (void);
+ IR_ExcDescriptionSeq *ptr (void) const;
--#if !defined (_IR_EXCDESCRIPTIONSEQ___OUT_CH_)
--#define _IR_EXCDESCRIPTIONSEQ___OUT_CH_
-+private:
+ private:
+- ExcDescriptionSeq *ptr_;
+ IR_ExcDescriptionSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_EXCDESCRIPTIONSEQ___OUT_CH_)
+-#define _IR_EXCDESCRIPTIONSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export ExcDescriptionSeq_out
+class TAO_IFR_Client_Export IR_ExcDescriptionSeq_out
{
@@ -20178,7 +15099,6 @@
- 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 &);
@@ -20188,26 +15108,25 @@
+ 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
-+class TAO_IFR_Client_Export IR_AttributeDef_var : public TAO_Base_var
- {
+-{
- ATTR_NORMAL,
- ATTR_READONLY
--};
++ void operator= (const IR_ExcDescriptionSeq_var &);
+ };
-typedef AttributeMode &AttributeMode_out;
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttributeMode;
-
@@ -20217,44 +15136,43 @@
-
-class AttributeDef;
-typedef AttributeDef *AttributeDef_ptr;
--
+
-#endif /* end #if !defined */
-
-+public:
-+ 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
-
+-
-#if !defined (_IR_ATTRIBUTEDEF___VAR_CH_)
-#define _IR_ATTRIBUTEDEF___VAR_CH_
-+ IR_AttributeDef_var &operator= (IR_AttributeDef_ptr);
-+ IR_AttributeDef_var &operator= (const IR_AttributeDef_var &);
-+ IR_AttributeDef_ptr operator-> (void) const;
-
+-
-class TAO_IFR_Client_Export AttributeDef_var : public TAO_Base_var
--{
--public:
++class TAO_IFR_Client_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 &();
-- // in, inout, out, _retn
++ 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;
-+ operator const IR_AttributeDef_ptr &() const;
-+ operator IR_AttributeDef_ptr &();
-+ // in, inout, out, _retn
+ IR_AttributeDef_ptr in (void) const;
+ IR_AttributeDef_ptr &inout (void);
+ IR_AttributeDef_ptr &out (void);
@@ -20291,7 +15209,6 @@
- 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 &);
@@ -20301,7 +15218,7 @@
+ operator IR_AttributeDef_ptr &();
+ IR_AttributeDef_ptr &ptr (void);
+ IR_AttributeDef_ptr operator-> (void);
-+
+
private:
- AttributeDef_ptr &ptr_;
+ IR_AttributeDef_ptr &ptr_;
@@ -20337,15 +15254,13 @@
+ static IR_AttributeDef_ptr _duplicate (IR_AttributeDef_ptr obj);
+ static IR_AttributeDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static AttributeDef_ptr _nil (void)
@@ -20356,359 +15271,183 @@
}
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 ((
+@@ -17013,7 +14056,7 @@
CORBA::SystemException
));
- virtual IR::IDLType_ptr type_def (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_IDLType_ptr type_def (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -17042,16 +10493,16 @@
+@@ -17022,7 +14065,7 @@
));
virtual void type_def (
- IR::IDLType_ptr type_def,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_IDLType_ptr type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -17030,7 +14073,7 @@
CORBA::SystemException
));
- virtual IR::AttributeMode mode (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_AttributeMode mode (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -17059,8 +10510,8 @@
+@@ -17039,7 +14082,7 @@
));
virtual void mode (
- IR::AttributeMode mode,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_AttributeMode mode,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -17068,276 +10519,58 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -17060,14 +14103,14 @@
_TAO_AttributeDef_Proxy_Broker *the_TAO_AttributeDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- AttributeDef (
-- TAO_Stub *objref,
+ 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 IR_AttributeDef_setup_collocation (int collocated);
+
+- AttributeDef (
+ IR_AttributeDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -17077,10 +14120,10 @@
+ friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_AttributeDef_Direct_Proxy_Impl;
+
- virtual ~AttributeDef (void);
--private:
++ virtual ~IR_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
--};
++ IR_AttributeDef (const IR_AttributeDef &);
++ void operator= (const IR_AttributeDef &);
--class TAO_ClientRequestInfo_IR_AttributeDef_type_def_get : public TAO_ClientRequestInfo
--{
--public:
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -17090,7 +14133,7 @@
+ class TAO_ClientRequestInfo_IR_AttributeDef_type_get : public TAO_ClientRequestInfo
+ {
+ public:
+- friend class IR::AttributeDef;
++ friend class IR_AttributeDef;
+
+ friend class _TAO_AttributeDef_Remote_Proxy_Impl;
+ friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
+@@ -17132,7 +14175,7 @@
+ class TAO_ClientRequestInfo_IR_AttributeDef_type_def_get : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::AttributeDef;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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_AttributeDef (void);
+@@ -17166,15 +14209,15 @@
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 &);
+ 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
++ void result (IR_IDLType_ptr result);
+ // update the result
- IR::IDLType_ptr _result;
-+ IR_AttributeDef (const IR_AttributeDef &);
-+ void operator= (const IR_AttributeDef &);
++ IR_IDLType_ptr _result;
};
--class TAO_ClientRequestInfo_IR_AttributeDef_type_def_set : public TAO_ClientRequestInfo
--{
--public:
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_AttributeDef;
+
+ friend class _TAO_AttributeDef_Remote_Proxy_Impl;
+ friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
+@@ -17183,7 +14226,7 @@
+ TAO_ClientRequestInfo_IR_AttributeDef_type_def_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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));
-+// 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_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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -17209,14 +14252,14 @@
+ 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_;
--
--};
-+///////////////////////////////////////////////////////////////////////
-+// Base Impl. Declaration
-+//
++ IR_IDLType_ptr type_def_;
+
+ };
--class TAO_ClientRequestInfo_IR_AttributeDef_mode_get : public TAO_ClientRequestInfo
--{
--public:
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_AttributeDef;
+
+ friend class _TAO_AttributeDef_Remote_Proxy_Impl;
+ friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
+@@ -17250,15 +14293,15 @@
+ 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
++ void result (IR_AttributeMode result);
+ // update the result
- IR::AttributeMode _result;
--};
--
--class TAO_ClientRequestInfo_IR_AttributeDef_mode_set : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_AttributeDef;
+
+ friend class _TAO_AttributeDef_Remote_Proxy_Impl;
+ friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
+@@ -17267,7 +14310,7 @@
+ TAO_ClientRequestInfo_IR_AttributeDef_mode_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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));
--
--private:
-- TAO_ClientRequestInfo_IR_AttributeDef_mode_set (const TAO_ClientRequestInfo_IR_AttributeDef_mode_set &);
-- void operator= (const TAO_ClientRequestInfo_IR_AttributeDef_mode_set &);
++ IR_AttributeMode & mode,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -17293,7 +14336,7 @@
+ 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 */
--
--};
--
--
--// The Proxy Implementations are used by each interface to
--// perform a call. Each different implementation encapsulate
--// an invocation logics.
--
--
--///////////////////////////////////////////////////////////////////////
--// Base Impl. Declaration
--//
--
--class TAO_IFR_Client_Export _TAO_AttributeDef_Proxy_Impl :
++ const IR_AttributeMode & mode_;
+
+ };
+
+@@ -17312,7 +14355,7 @@
+ //
+
+ class TAO_IFR_Client_Export _TAO_AttributeDef_Proxy_Impl :
- public virtual IR::_TAO_Contained_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_AttributeDef_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
- )
-@@ -17345,7 +10578,7 @@
+@@ -17325,7 +14368,7 @@
CORBA::SystemException
)) = 0;
@@ -20717,7 +15456,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -17355,14 +10588,14 @@
+@@ -17335,14 +14378,14 @@
virtual void type_def (
CORBA_Object *_collocated_tao_target_,
@@ -20734,7 +15473,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -17372,7 +10605,7 @@
+@@ -17352,7 +14395,7 @@
virtual void mode (
CORBA_Object *_collocated_tao_target_,
@@ -20743,7 +15482,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -17383,6 +10616,7 @@
+@@ -17363,6 +14406,7 @@
_TAO_AttributeDef_Proxy_Impl (void);
};
@@ -20751,32 +15490,16 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -17392,18 +10626,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_AttributeDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_AttributeDef_Remote_Proxy_Impl :
+@@ -17375,7 +14419,7 @@
+ class TAO_IFR_Client_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:
- _TAO_AttributeDef_Remote_Proxy_Impl (void);
--
-+
- 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
- )
-@@ -17411,7 +10645,7 @@
+@@ -17391,7 +14435,7 @@
CORBA::SystemException
));
@@ -20785,7 +15508,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -17421,14 +10655,14 @@
+@@ -17401,14 +14445,14 @@
virtual void type_def (
CORBA_Object *_collocated_tao_target_,
@@ -20802,7 +15525,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -17438,7 +10672,7 @@
+@@ -17418,7 +14462,7 @@
virtual void mode (
CORBA_Object *_collocated_tao_target_,
@@ -20811,24 +15534,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -17453,49 +10687,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_AttributeDef_Proxy_Broker
+@@ -17447,8 +14491,9 @@
{
public:
virtual ~_TAO_AttributeDef_Proxy_Broker (void);
@@ -20839,48 +15545,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_AttributeDef_Proxy_Broker (void);
--
-+
+@@ -17457,6 +14502,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_AttributeDef_Remote_Proxy_Broker : public virtual _TAO_AttributeDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_AttributeDef_Remote_Proxy_Broker (void);
--
-+
+@@ -17474,7 +14520,7 @@
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 ()
);
-@@ -17509,24 +10744,15 @@
+@@ -17488,24 +14534,15 @@
static _TAO_AttributeDef_Remote_Proxy_Broker *the_TAO_AttributeDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -20901,47 +15589,70 @@
#endif /* ! __GNUC__ || g++ >= 2.8 */
static void _tao_any_destructor (void*);
-@@ -17536,525 +10762,413 @@
+@@ -17515,150 +14552,122 @@
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_IFR_Client_Export AttributeDescription_var
--{
--public:
++class TAO_IFR_Client_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
--
-- // in, inout, out, _retn
++ 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;
--
--private:
++ 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_IFR_Client_Export AttributeDescription_out
--{
--public:
++class TAO_IFR_Client_Export IR_AttributeDescription_out
+ {
+ public:
- AttributeDescription_out (AttributeDescription *&);
- AttributeDescription_out (AttributeDescription_var &);
- AttributeDescription_out (const AttributeDescription_out &);
@@ -20950,79 +15661,45 @@
- operator AttributeDescription *&();
- AttributeDescription *&ptr (void);
- AttributeDescription *operator-> (void);
--
--private:
++ 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_;
-- // assignment from T_var not allowed
++ IR_AttributeDescription *&ptr_;
+ // assignment from T_var not allowed
- void operator= (const AttributeDescription_var &);
-+ IR_AttributeMode mode;
-+ IR_ExcDescriptionSeq get_exceptions;
-+ IR_ExcDescriptionSeq put_exceptions;
- };
-
+-};
+-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttributeDescription;
-
-enum OperationMode
-+class TAO_IFR_Client_Export IR_AttributeDescription_var
- {
+-{
- OP_NORMAL,
- OP_ONEWAY
-+public:
-+ 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
-+
-+ 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
-+ const IR_AttributeDescription &in (void) const;
-+ IR_AttributeDescription &inout (void);
-+ IR_AttributeDescription *&out (void);
-+ IR_AttributeDescription *_retn (void);
-+ IR_AttributeDescription *ptr (void) const;
-+
-+private:
-+ IR_AttributeDescription *ptr_;
- };
+-};
-typedef OperationMode &OperationMode_out;
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OperationMode;
-
+-
-enum ParameterMode
-+class TAO_IFR_Client_Export IR_AttributeDescription_out
- {
+-{
- PARAM_IN,
- PARAM_OUT,
- PARAM_INOUT
--};
++ void operator= (const IR_AttributeDescription_var &);
+ };
-typedef ParameterMode &ParameterMode_out;
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ParameterMode;
-+public:
-+ 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);
-struct ParameterDescription;
-class ParameterDescription_var;
-+private:
-+ IR_AttributeDescription *&ptr_;
-+ // assignment from T_var not allowed
-+ void operator= (const IR_AttributeDescription_var &);
-+};
-
+-
-struct TAO_IFR_Client_Export ParameterDescription
+struct TAO_IFR_Client_Export IR_ParameterDescription
{
@@ -21050,73 +15727,58 @@
- 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
--
-- // in, inout, out, _retn
++ 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;
--
--private:
-- ParameterDescription *ptr_;
--};
--
--class TAO_IFR_Client_Export 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_var (void); // default constructor
-+ 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
+ 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_;
-- // assignment from T_var not allowed
-- void operator= (const ParameterDescription_var &);
+- ParameterDescription *ptr_;
+ IR_ParameterDescription *ptr_;
};
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ParameterDescription;
+-class TAO_IFR_Client_Export ParameterDescription_out
+class TAO_IFR_Client_Export IR_ParameterDescription_out
-+{
-+public:
+ {
+ 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 &);
@@ -21125,27 +15787,28 @@
+ operator IR_ParameterDescription *&();
+ IR_ParameterDescription *&ptr (void);
+ IR_ParameterDescription *operator-> (void);
-
-+private:
+
+ private:
+- ParameterDescription *&ptr_;
+ IR_ParameterDescription *&ptr_;
-+ // assignment from T_var not allowed
+ // 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_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CH_
-
+-
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);
+@@ -17668,160 +14677,121 @@
+ _TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum,
CORBA::ULong length,
- ParameterDescription *data,
@@ -21167,10 +15830,9 @@
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,
@@ -21183,15 +15845,14 @@
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
--
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_PARDESCRIPTIONSEQ_CH_)
-#define _IR_PARDESCRIPTIONSEQ_CH_
-
-class ParDescriptionSeq;
-class ParDescriptionSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// ParDescriptionSeq
+// IR_ParDescriptionSeq
@@ -21203,22 +15864,19 @@
_TAO_Unbounded_Sequence_IR_ParDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Sequence<ParameterDescription>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Sequence<IR_ParameterDescription>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- ParDescriptionSeq (void); // default ctor
- ParDescriptionSeq (CORBA::ULong max); // uses max size
- ParDescriptionSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- ParameterDescription *buffer,
+ IR_ParDescriptionSeq (void); // default ctor
+ IR_ParDescriptionSeq (CORBA::ULong max); // uses max size
+ IR_ParDescriptionSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- ParameterDescription *buffer,
+ IR_ParameterDescription *buffer,
CORBA::Boolean release = 0
);
@@ -21254,61 +15912,58 @@
- 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;
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- ParDescriptionSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ 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);
+ IR_ParDescriptionSeq *_retn (void);
+ IR_ParDescriptionSeq *ptr (void) const;
--#if !defined (_IR_PARDESCRIPTIONSEQ___OUT_CH_)
--#define _IR_PARDESCRIPTIONSEQ___OUT_CH_
-+private:
+ private:
+- ParDescriptionSeq *ptr_;
+ IR_ParDescriptionSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_PARDESCRIPTIONSEQ___OUT_CH_)
+-#define _IR_PARDESCRIPTIONSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export ParDescriptionSeq_out
+class TAO_IFR_Client_Export IR_ParDescriptionSeq_out
{
@@ -21322,7 +15977,6 @@
- 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 &);
@@ -21332,7 +15986,7 @@
+ IR_ParDescriptionSeq *&ptr (void);
+ IR_ParDescriptionSeq *operator-> (void);
+ IR_ParameterDescription & operator[] (CORBA::ULong index);
-+
+
private:
- ParDescriptionSeq *&ptr_;
+ IR_ParDescriptionSeq *&ptr_;
@@ -21368,23 +16022,19 @@
#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 */
+@@ -17829,197 +14799,152 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- ContextIdSeq (void); // default ctor
- ContextIdSeq (CORBA::ULong max); // uses max size
- ContextIdSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- char * *buffer,
+ IR_ContextIdSeq (void); // default ctor
+ IR_ContextIdSeq (CORBA::ULong max); // uses max size
+ IR_ContextIdSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
-+ char * *buffer,
+ CORBA::ULong max,
+ CORBA::ULong length,
+ char * *buffer,
CORBA::Boolean release = 0
);
- ContextIdSeq (const ContextIdSeq &); // copy ctor
@@ -21419,59 +16069,55 @@
- 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
--
-- TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- ContextIdSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-
-+ // in, inout, out, _retn
+ const IR_ContextIdSeq &in (void) const;
+ IR_ContextIdSeq &inout (void);
+ IR_ContextIdSeq *&out (void);
+ IR_ContextIdSeq *_retn (void);
+ IR_ContextIdSeq *ptr (void) const;
--#if !defined (_IR_CONTEXTIDSEQ___OUT_CH_)
--#define _IR_CONTEXTIDSEQ___OUT_CH_
-+private:
+ private:
+- ContextIdSeq *ptr_;
+ IR_ContextIdSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_CONTEXTIDSEQ___OUT_CH_)
+-#define _IR_CONTEXTIDSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export ContextIdSeq_out
+class TAO_IFR_Client_Export IR_ContextIdSeq_out
{
@@ -21493,8 +16139,7 @@
+ IR_ContextIdSeq *&ptr (void);
+ IR_ContextIdSeq *operator-> (void);
TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
--
-+
+
private:
- ContextIdSeq *&ptr_;
+ IR_ContextIdSeq *&ptr_;
@@ -21529,31 +16174,28 @@
- 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 &();
-- // in, inout, out, _retn
++ 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_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
-+
-+ 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
+ IR_OperationDef_ptr in (void) const;
+ IR_OperationDef_ptr &inout (void);
+ IR_OperationDef_ptr &out (void);
@@ -21590,7 +16232,6 @@
- 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 &);
@@ -21600,7 +16241,7 @@
+ operator IR_OperationDef_ptr &();
+ IR_OperationDef_ptr &ptr (void);
+ IR_OperationDef_ptr operator-> (void);
-+
+
private:
- OperationDef_ptr &ptr_;
+ IR_OperationDef_ptr &ptr_;
@@ -21636,15 +16277,13 @@
+ static IR_OperationDef_ptr _duplicate (IR_OperationDef_ptr obj);
+ static IR_OperationDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static OperationDef_ptr _nil (void)
@@ -21655,826 +16294,449 @@
}
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 ((
+@@ -18032,7 +14957,7 @@
CORBA::SystemException
));
- virtual IR::IDLType_ptr result_def (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_IDLType_ptr result_def (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -18062,16 +11176,16 @@
+@@ -18041,7 +14966,7 @@
));
virtual void result_def (
- IR::IDLType_ptr result_def,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_IDLType_ptr result_def,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -18049,7 +14974,7 @@
CORBA::SystemException
));
- virtual IR::ParDescriptionSeq * params (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_ParDescriptionSeq * params (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -18079,16 +11193,16 @@
+@@ -18058,7 +14983,7 @@
));
virtual void params (
- const IR::ParDescriptionSeq & params,
-- CORBA::Environment &ACE_TRY_ENV =
+ const IR_ParDescriptionSeq & params,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -18066,7 +14991,7 @@
CORBA::SystemException
));
- virtual IR::OperationMode mode (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_OperationMode mode (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -18096,16 +11210,16 @@
+@@ -18075,7 +15000,7 @@
));
virtual void mode (
- IR::OperationMode mode,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_OperationMode mode,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -18083,7 +15008,7 @@
CORBA::SystemException
));
- virtual IR::ContextIdSeq * contexts (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_ContextIdSeq * contexts (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -18113,16 +11227,16 @@
+@@ -18092,7 +15017,7 @@
));
virtual void contexts (
- const IR::ContextIdSeq & contexts,
-- CORBA::Environment &ACE_TRY_ENV =
+ const IR_ContextIdSeq & contexts,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -18100,7 +15025,7 @@
CORBA::SystemException
));
- virtual IR::ExceptionDefSeq * exceptions (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_ExceptionDefSeq * exceptions (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -18130,8 +11244,8 @@
+@@ -18109,7 +15034,7 @@
));
virtual void exceptions (
- const IR::ExceptionDefSeq & exceptions,
-- CORBA::Environment &ACE_TRY_ENV =
+ const IR_ExceptionDefSeq & exceptions,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -18139,614 +11253,144 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -18130,14 +15055,14 @@
_TAO_OperationDef_Proxy_Broker *the_TAO_OperationDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- OperationDef (
-- TAO_Stub *objref,
+ 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 IR_OperationDef_setup_collocation (int collocated);
+
+- OperationDef (
+ IR_OperationDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -18147,10 +15072,10 @@
+ friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_OperationDef_Direct_Proxy_Impl;
+
- virtual ~OperationDef (void);
--private:
++ virtual ~IR_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
--};
++ IR_OperationDef (const IR_OperationDef &);
++ void operator= (const IR_OperationDef &);
--class TAO_ClientRequestInfo_IR_OperationDef_result_def_get : public TAO_ClientRequestInfo
--{
--public:
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -18160,7 +15085,7 @@
+ class TAO_ClientRequestInfo_IR_OperationDef_result_get : public TAO_ClientRequestInfo
+ {
+ public:
+- friend class IR::OperationDef;
++ friend class IR_OperationDef;
+
+ friend class _TAO_OperationDef_Remote_Proxy_Impl;
+ friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+@@ -18202,7 +15127,7 @@
+ class TAO_ClientRequestInfo_IR_OperationDef_result_def_get : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::OperationDef;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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_OperationDef (void);
+@@ -18236,15 +15161,15 @@
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 &);
+ 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
++ void result (IR_IDLType_ptr result);
+ // update the result
- IR::IDLType_ptr _result;
-+ IR_OperationDef (const IR_OperationDef &);
-+ void operator= (const IR_OperationDef &);
++ IR_IDLType_ptr _result;
};
--class TAO_ClientRequestInfo_IR_OperationDef_result_def_set : public TAO_ClientRequestInfo
--{
--public:
+ 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;
--
--TAO_ClientRequestInfo_IR_OperationDef_result_def_set (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_OperationDef;
+
+ friend class _TAO_OperationDef_Remote_Proxy_Impl;
+ friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+@@ -18253,7 +15178,7 @@
+ TAO_ClientRequestInfo_IR_OperationDef_result_def_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -18279,14 +15204,14 @@
+ 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
-+//
++ IR_IDLType_ptr result_def_;
+
+ };
--class TAO_ClientRequestInfo_IR_OperationDef_params_get : public TAO_ClientRequestInfo
-+class TAO_IFR_Client_Export _TAO_OperationDef_Proxy_Impl :
-+ public virtual _TAO_Contained_Proxy_Impl
+ class TAO_ClientRequestInfo_IR_OperationDef_params_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_params_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual ~_TAO_OperationDef_Proxy_Impl (void) { }
-
--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 &);
++ friend class IR_OperationDef;
+
+ friend class _TAO_OperationDef_Remote_Proxy_Impl;
+ friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+@@ -18320,15 +15245,15 @@
+ 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
++ 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:
++ IR_ParDescriptionSeq * _result;
+ };
+
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_OperationDef;
+
+ friend class _TAO_OperationDef_Remote_Proxy_Impl;
+ friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+@@ -18337,7 +15262,7 @@
+ TAO_ClientRequestInfo_IR_OperationDef_params_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -18363,14 +15288,14 @@
+ 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_;
--
--};
--
--class TAO_ClientRequestInfo_IR_OperationDef_mode_get : public TAO_ClientRequestInfo
--{
--public:
++ const IR_ParDescriptionSeq & params_;
+
+ };
+
+ 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;
--
--TAO_ClientRequestInfo_IR_OperationDef_mode_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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_mode_get (const TAO_ClientRequestInfo_IR_OperationDef_mode_get &);
-- void operator= (const TAO_ClientRequestInfo_IR_OperationDef_mode_get &);
++ friend class IR_OperationDef;
+
+ friend class _TAO_OperationDef_Remote_Proxy_Impl;
+ friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+@@ -18404,15 +15329,15 @@
+ 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
++ void result (IR_OperationMode result);
+ // update the result
- IR::OperationMode _result;
--};
--
--class TAO_ClientRequestInfo_IR_OperationDef_mode_set : public TAO_ClientRequestInfo
--{
--public:
++ IR_OperationMode _result;
+ };
+
+ class TAO_ClientRequestInfo_IR_OperationDef_mode_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_mode_set (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_OperationDef;
+
+ friend class _TAO_OperationDef_Remote_Proxy_Impl;
+ friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+@@ -18421,7 +15346,7 @@
+ TAO_ClientRequestInfo_IR_OperationDef_mode_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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 &);
++ IR_OperationMode & mode,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -18447,14 +15372,14 @@
+ 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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_OperationDef;
+
+ friend class _TAO_OperationDef_Remote_Proxy_Impl;
+ friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+@@ -18488,15 +15413,15 @@
+ 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
++ void result (IR_ContextIdSeq * result);
+ // update the result
- IR::ContextIdSeq * _result;
--};
--
--class TAO_ClientRequestInfo_IR_OperationDef_contexts_set : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_OperationDef;
+
+ friend class _TAO_OperationDef_Remote_Proxy_Impl;
+ friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+@@ -18505,7 +15430,7 @@
+ TAO_ClientRequestInfo_IR_OperationDef_contexts_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -18531,14 +15456,14 @@
+ 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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_OperationDef;
+
+ friend class _TAO_OperationDef_Remote_Proxy_Impl;
+ friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+@@ -18572,15 +15497,15 @@
+ 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
++ void result (IR_ExceptionDefSeq * result);
+ // update the result
- IR::ExceptionDefSeq * _result;
--};
--
--class TAO_ClientRequestInfo_IR_OperationDef_exceptions_set : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_OperationDef;
+
+ friend class _TAO_OperationDef_Remote_Proxy_Impl;
+ friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+@@ -18589,7 +15514,7 @@
+ TAO_ClientRequestInfo_IR_OperationDef_exceptions_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -18615,7 +15540,7 @@
+ 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_IFR_Client_Export _TAO_OperationDef_Proxy_Impl :
++ const IR_ExceptionDefSeq & exceptions_;
+
+ };
+
+@@ -18634,7 +15559,7 @@
+ //
+
+ class TAO_IFR_Client_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;
--
++ public virtual _TAO_Contained_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_OperationDef_Proxy_Impl (void) { }
+@@ -18647,7 +15572,7 @@
+ 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_,
++ virtual IR_IDLType_ptr result_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -18657,14 +15582,14 @@
+
+ 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;
--
++ 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_,
++ virtual IR_ParDescriptionSeq * params (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -18674,14 +15599,14 @@
+
+ virtual void params (
+ CORBA_Object *_collocated_tao_target_,
- const IR::ParDescriptionSeq & params,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
++ 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_,
++ virtual IR_OperationMode mode (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -18691,14 +15616,14 @@
+
+ virtual void mode (
+ CORBA_Object *_collocated_tao_target_,
- IR::OperationMode mode,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
++ 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_,
++ virtual IR_ContextIdSeq * contexts (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -18708,14 +15633,14 @@
+
+ virtual void contexts (
+ CORBA_Object *_collocated_tao_target_,
- const IR::ContextIdSeq & contexts,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
++ 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 IR_ExceptionDefSeq * exceptions (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -18725,7 +15650,7 @@
virtual void exceptions (
CORBA_Object *_collocated_tao_target_,
@@ -22483,7 +16745,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -18757,6 +11401,7 @@
+@@ -18736,6 +15661,7 @@
_TAO_OperationDef_Proxy_Impl (void);
};
@@ -22491,33 +16753,16 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -18766,26 +11411,26 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_OperationDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_OperationDef_Remote_Proxy_Impl :
+@@ -18748,7 +15674,7 @@
+ class TAO_IFR_Client_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 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 (
-+
-+ virtual CORBA::TypeCode_ptr result (
- CORBA_Object *_collocated_tao_target_,
-- CORBA::Environment &ACE_TRY_ENV
-+ CORBA::Environment &ACE_TRY_ENV
- )
- ACE_THROW_SPEC ((
+@@ -18764,7 +15690,7 @@
CORBA::SystemException
));
@@ -22526,7 +16771,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -18795,14 +11440,14 @@
+@@ -18774,14 +15700,14 @@
virtual void result_def (
CORBA_Object *_collocated_tao_target_,
@@ -22543,7 +16788,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -18812,14 +11457,14 @@
+@@ -18791,14 +15717,14 @@
virtual void params (
CORBA_Object *_collocated_tao_target_,
@@ -22560,7 +16805,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -18829,14 +11474,14 @@
+@@ -18808,14 +15734,14 @@
virtual void mode (
CORBA_Object *_collocated_tao_target_,
@@ -22577,7 +16822,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -18846,14 +11491,14 @@
+@@ -18825,14 +15751,14 @@
virtual void contexts (
CORBA_Object *_collocated_tao_target_,
@@ -22594,7 +16839,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -18863,7 +11508,7 @@
+@@ -18842,7 +15768,7 @@
virtual void exceptions (
CORBA_Object *_collocated_tao_target_,
@@ -22603,24 +16848,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -18878,49 +11523,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_OperationDef_Proxy_Broker
+@@ -18871,8 +15797,9 @@
{
public:
virtual ~_TAO_OperationDef_Proxy_Broker (void);
@@ -22631,48 +16859,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_OperationDef_Proxy_Broker (void);
--
-+
+@@ -18881,6 +15808,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_OperationDef_Remote_Proxy_Broker : public virtual _TAO_OperationDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_OperationDef_Remote_Proxy_Broker (void);
--
-+
+@@ -18898,7 +15826,7 @@
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 ()
);
-@@ -18934,24 +11580,15 @@
+@@ -18912,24 +15840,15 @@
static _TAO_OperationDef_Remote_Proxy_Broker *the_TAO_OperationDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -22693,7 +16903,7 @@
#endif /* ! __GNUC__ || g++ >= 2.8 */
static void _tao_any_destructor (void*);
-@@ -18961,581 +11598,421 @@
+@@ -18939,73 +15858,64 @@
TAO_String_Manager defined_in;
TAO_String_Manager version;
CORBA::TypeCode_var result;
@@ -22701,40 +16911,64 @@
- 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_IFR_Client_Export OperationDescription_var
--{
--public:
++class TAO_IFR_Client_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
--
-- // in, inout, out, _retn
++ 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;
--
--private:
++ 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_IFR_Client_Export OperationDescription_out
--{
--public:
++class TAO_IFR_Client_Export IR_OperationDescription_out
+ {
+ public:
- OperationDescription_out (OperationDescription *&);
- OperationDescription_out (OperationDescription_var &);
- OperationDescription_out (const OperationDescription_out &);
@@ -22743,52 +16977,6 @@
- operator OperationDescription *&();
- OperationDescription *&ptr (void);
- OperationDescription *operator-> (void);
--
--private:
-- OperationDescription *&ptr_;
-- // assignment from T_var not allowed
-- void operator= (const OperationDescription_var &);
-+ IR_OperationMode mode;
-+ IR_ContextIdSeq contexts;
-+ IR_ParDescriptionSeq parameters;
-+ IR_ExcDescriptionSeq exceptions;
- };
-
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OperationDescription;
-+class TAO_IFR_Client_Export IR_OperationDescription_var
-+{
-+public:
-+ 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
-+
-+ 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
-+ const IR_OperationDescription &in (void) const;
-+ IR_OperationDescription &inout (void);
-+ IR_OperationDescription *&out (void);
-+ IR_OperationDescription *_retn (void);
-+ IR_OperationDescription *ptr (void) const;
-+
-+private:
-+ IR_OperationDescription *ptr_;
-+};
-
--#if !defined (_IR_REPOSITORYIDSEQ_CH_)
--#define _IR_REPOSITORYIDSEQ_CH_
-+class TAO_IFR_Client_Export IR_OperationDescription_out
-+{
-+public:
+ IR_OperationDescription_out (IR_OperationDescription *&);
+ IR_OperationDescription_out (IR_OperationDescription_var &);
+ IR_OperationDescription_out (const IR_OperationDescription_out &);
@@ -22797,15 +16985,24 @@
+ operator IR_OperationDescription *&();
+ IR_OperationDescription *&ptr (void);
+ IR_OperationDescription *operator-> (void);
-
--class RepositoryIdSeq;
--class RepositoryIdSeq_var;
-+private:
+
+ private:
+- OperationDescription *&ptr_;
+ IR_OperationDescription *&ptr_;
-+ // assignment from T_var not allowed
+ // 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 (_IR_REPOSITORYIDSEQ_CH_)
+-#define _IR_REPOSITORYIDSEQ_CH_
+-
+-class RepositoryIdSeq;
+-class RepositoryIdSeq_var;
+-
// *************************************************************
-// RepositoryIdSeq
+// IR_RepositoryIdSeq
@@ -22816,23 +17013,19 @@
#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 */
+@@ -19013,102 +15923,80 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- RepositoryIdSeq (void); // default ctor
- RepositoryIdSeq (CORBA::ULong max); // uses max size
- RepositoryIdSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- char * *buffer,
+ IR_RepositoryIdSeq (void); // default ctor
+ IR_RepositoryIdSeq (CORBA::ULong max); // uses max size
+ IR_RepositoryIdSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
-+ char * *buffer,
+ CORBA::ULong max,
+ CORBA::ULong length,
+ char * *buffer,
CORBA::Boolean release = 0
);
- RepositoryIdSeq (const RepositoryIdSeq &); // copy ctor
@@ -22867,59 +17060,55 @@
- 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
--
-- TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- RepositoryIdSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-
-+ // in, inout, out, _retn
+ const IR_RepositoryIdSeq &in (void) const;
+ IR_RepositoryIdSeq &inout (void);
+ IR_RepositoryIdSeq *&out (void);
+ IR_RepositoryIdSeq *_retn (void);
+ IR_RepositoryIdSeq *ptr (void) const;
--#if !defined (_IR_REPOSITORYIDSEQ___OUT_CH_)
--#define _IR_REPOSITORYIDSEQ___OUT_CH_
-+private:
+ private:
+- RepositoryIdSeq *ptr_;
+ IR_RepositoryIdSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_REPOSITORYIDSEQ___OUT_CH_)
+-#define _IR_REPOSITORYIDSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export RepositoryIdSeq_out
+class TAO_IFR_Client_Export IR_RepositoryIdSeq_out
{
@@ -22941,8 +17130,7 @@
+ IR_RepositoryIdSeq *&ptr (void);
+ IR_RepositoryIdSeq *operator-> (void);
TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
--
-+
+
private:
- RepositoryIdSeq *&ptr_;
+ IR_RepositoryIdSeq *&ptr_;
@@ -22958,19 +17146,15 @@
-
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
+
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CH_
-
+-
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);
+@@ -19118,149 +16006,118 @@
+ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum,
CORBA::ULong length,
- OperationDescription *data,
@@ -22992,10 +17176,9 @@
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,
@@ -23008,15 +17191,14 @@
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
--
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_OPDESCRIPTIONSEQ_CH_)
-#define _IR_OPDESCRIPTIONSEQ_CH_
-
-class OpDescriptionSeq;
-class OpDescriptionSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// OpDescriptionSeq
+// IR_OpDescriptionSeq
@@ -23028,22 +17210,19 @@
_TAO_Unbounded_Sequence_IR_OpDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Sequence<OperationDescription>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Sequence<IR_OperationDescription>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- OpDescriptionSeq (void); // default ctor
- OpDescriptionSeq (CORBA::ULong max); // uses max size
- OpDescriptionSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- OperationDescription *buffer,
+ IR_OpDescriptionSeq (void); // default ctor
+ IR_OpDescriptionSeq (CORBA::ULong max); // uses max size
+ IR_OpDescriptionSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- OperationDescription *buffer,
+ IR_OperationDescription *buffer,
CORBA::Boolean release = 0
);
@@ -23079,61 +17258,58 @@
- 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;
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- OpDescriptionSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ 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);
+ IR_OpDescriptionSeq *_retn (void);
+ IR_OpDescriptionSeq *ptr (void) const;
--#if !defined (_IR_OPDESCRIPTIONSEQ___OUT_CH_)
--#define _IR_OPDESCRIPTIONSEQ___OUT_CH_
-+private:
+ private:
+- OpDescriptionSeq *ptr_;
+ IR_OpDescriptionSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_OPDESCRIPTIONSEQ___OUT_CH_)
+-#define _IR_OPDESCRIPTIONSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export OpDescriptionSeq_out
+class TAO_IFR_Client_Export IR_OpDescriptionSeq_out
{
@@ -23147,7 +17323,6 @@
- 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 &);
@@ -23157,7 +17332,7 @@
+ IR_OpDescriptionSeq *&ptr (void);
+ IR_OpDescriptionSeq *operator-> (void);
+ IR_OperationDescription & operator[] (CORBA::ULong index);
-+
+
private:
- OpDescriptionSeq *&ptr_;
+ IR_OpDescriptionSeq *&ptr_;
@@ -23173,19 +17348,15 @@
-
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
+
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CH_
-
+-
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);
+@@ -19270,249 +16127,151 @@
+ _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum,
CORBA::ULong length,
- AttributeDescription *data,
@@ -23207,10 +17378,9 @@
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,
@@ -23223,15 +17393,14 @@
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
--
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_ATTRDESCRIPTIONSEQ_CH_)
-#define _IR_ATTRDESCRIPTIONSEQ_CH_
-
-class AttrDescriptionSeq;
-class AttrDescriptionSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// AttrDescriptionSeq
+// IR_AttrDescriptionSeq
@@ -23243,22 +17412,19 @@
_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Sequence<AttributeDescription>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Sequence<IR_AttributeDescription>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- AttrDescriptionSeq (void); // default ctor
- AttrDescriptionSeq (CORBA::ULong max); // uses max size
- AttrDescriptionSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- AttributeDescription *buffer,
+ IR_AttrDescriptionSeq (void); // default ctor
+ IR_AttrDescriptionSeq (CORBA::ULong max); // uses max size
+ IR_AttrDescriptionSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- AttributeDescription *buffer,
+ IR_AttributeDescription *buffer,
CORBA::Boolean release = 0
);
@@ -23294,61 +17460,58 @@
- 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;
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- AttrDescriptionSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ 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);
+ IR_AttrDescriptionSeq *_retn (void);
+ IR_AttrDescriptionSeq *ptr (void) const;
--#if !defined (_IR_ATTRDESCRIPTIONSEQ___OUT_CH_)
--#define _IR_ATTRDESCRIPTIONSEQ___OUT_CH_
-+private:
+ private:
+- AttrDescriptionSeq *ptr_;
+ IR_AttrDescriptionSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_ATTRDESCRIPTIONSEQ___OUT_CH_)
+-#define _IR_ATTRDESCRIPTIONSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export AttrDescriptionSeq_out
+class TAO_IFR_Client_Export IR_AttrDescriptionSeq_out
{
@@ -23362,7 +17525,6 @@
- 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 &);
@@ -23372,21 +17534,15 @@
+ 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;
@@ -23405,9 +17561,8 @@
-#define _IR_INTERFACEDEF___VAR_CH_
-
-class TAO_IFR_Client_Export InterfaceDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_InterfaceDef: public virtual IR_Container, public virtual IR_Contained, public virtual IR_IDLType
- {
- public:
+-{
+-public:
- InterfaceDef_var (void); // default constructor
- InterfaceDef_var (InterfaceDef_ptr p) : ptr_ (p) {}
- InterfaceDef_var (const InterfaceDef_var &); // copy constructor
@@ -23455,8 +17610,9 @@
-
-private:
- InterfaceDef_ptr &ptr_;
--};
--
++ void operator= (const IR_AttrDescriptionSeq_var &);
+ };
+
-
-#endif /* end #if !defined */
-
@@ -23464,23 +17620,22 @@
-#if !defined (_IR_INTERFACEDEF_CH_)
-#define _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;
--
+ // 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_IFR_Client_Export InterfaceDef: public virtual Container, public virtual Contained, public virtual IDLType
--{
--public:
--#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
++class TAO_IFR_Client_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 InterfaceDef_ptr _ptr_type;
- typedef InterfaceDef_var _var_type;
--#endif /* ! __GNUC__ || g++ >= 2.8 */
-+#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 */
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
// the static operations
- static InterfaceDef_ptr _duplicate (InterfaceDef_ptr obj);
@@ -23488,15 +17643,13 @@
+ static IR_InterfaceDef_ptr _duplicate (IR_InterfaceDef_ptr obj);
+ static IR_InterfaceDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static InterfaceDef_ptr _nil (void)
@@ -23509,68 +17662,20 @@
static void _tao_any_destructor (void*);
- virtual IR::InterfaceDefSeq * base_interfaces (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_InterfaceDefSeq * base_interfaces (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -19543,8 +12020,8 @@
+@@ -19521,7 +16280,7 @@
));
virtual void base_interfaces (
- const IR::InterfaceDefSeq & base_interfaces,
-- CORBA::Environment &ACE_TRY_ENV =
+ const IR_InterfaceDefSeq & base_interfaces,
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -19552,7 +12029,7 @@
- ));
-
- virtual CORBA::Boolean is_abstract (
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -19561,7 +12038,7 @@
-
- virtual void is_abstract (
- CORBA::Boolean is_abstract,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -19569,7 +12046,7 @@
- ));
-
- virtual CORBA::Boolean is_local (
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -19578,7 +12055,7 @@
-
- virtual void is_local (
- CORBA::Boolean is_local,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -19587,38 +12064,38 @@
-
- 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 ((
+@@ -19572,14 +16331,14 @@
CORBA::SystemException
));
@@ -23583,15 +17688,14 @@
- IR::AttributeMode mode,
- const IR::ExceptionDefSeq & get_exceptions,
- const IR::ExceptionDefSeq & put_exceptions,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_IDLType_ptr type,
+ 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 ((
+@@ -19587,15 +16346,15 @@
CORBA::SystemException
));
@@ -23605,513 +17709,245 @@
- const IR::ParDescriptionSeq & params,
- const IR::ExceptionDefSeq & exceptions,
- const IR::ContextIdSeq & contexts,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_IDLType_ptr result,
+ 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 ((
-@@ -19626,457 +12103,39 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -19616,14 +16375,14 @@
_TAO_InterfaceDef_Proxy_Broker *the_TAO_InterfaceDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- InterfaceDef (
-- TAO_Stub *objref,
+ 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 IR_InterfaceDef_setup_collocation (int collocated);
+
+- InterfaceDef (
+ IR_InterfaceDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -19633,10 +16392,10 @@
+ friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
+
- virtual ~InterfaceDef (void);
--private:
++ virtual ~IR_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:
++ IR_InterfaceDef (const IR_InterfaceDef &);
++ void operator= (const IR_InterfaceDef &);
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -19646,7 +16405,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_InterfaceDef;
+
+ friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
+ friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
+@@ -19680,15 +16439,15 @@
+ 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
++ void result (IR_InterfaceDefSeq * result);
+ // update the result
- IR::InterfaceDefSeq * _result;
--};
--
--class TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_InterfaceDef;
+
+ friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
+ friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
+@@ -19697,7 +16456,7 @@
+ TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -19723,14 +16482,14 @@
+ 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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
+@@ -19772,7 +16531,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
+@@ -19814,7 +16573,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
+@@ -19856,7 +16615,7 @@
+ class TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::InterfaceDef;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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:
+@@ -19898,7 +16657,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
+@@ -19942,7 +16701,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++ friend class IR_InterfaceDef;
+
+ friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
+ friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
+@@ -19954,10 +16713,10 @@
+ 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,
++ IR_AttributeMode & mode,
++ const IR_ExceptionDefSeq & get_exceptions,
++ const IR_ExceptionDefSeq & put_exceptions,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -19986,19 +16745,19 @@
+ 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_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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++ friend class IR_InterfaceDef;
+
+ friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
+ friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
+@@ -20010,11 +16769,11 @@
+ 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,
++ IR_OperationMode & mode,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -20043,14 +16802,14 @@
+ 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_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 &);
++ IR_OperationDef_ptr _result;
};
-
-@@ -20089,15 +12148,15 @@
- // Base Impl. Declaration
+ #endif /* TAO_HAS_INTERCEPTORS */
+@@ -20068,14 +16827,14 @@
//
--class TAO_IFR_Client_Export _TAO_InterfaceDef_Proxy_Impl :
+ class TAO_IFR_Client_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
-+class TAO_IFR_Client_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 (
-+
+ virtual IR_InterfaceDefSeq * base_interfaces (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -20107,7 +12166,7 @@
+@@ -20085,7 +16844,7 @@
virtual void base_interfaces (
CORBA_Object *_collocated_tao_target_,
@@ -24120,7 +17956,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -20157,31 +12216,31 @@
+@@ -20135,31 +16894,31 @@
CORBA::SystemException
)) = 0;
@@ -24163,7 +17999,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -20192,6 +12251,7 @@
+@@ -20170,6 +16929,7 @@
_TAO_InterfaceDef_Proxy_Impl (void);
};
@@ -24171,36 +18007,29 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -20201,20 +12261,20 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_InterfaceDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_InterfaceDef_Remote_Proxy_Impl :
+@@ -20182,9 +16942,9 @@
+ class TAO_IFR_Client_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:
- _TAO_InterfaceDef_Remote_Proxy_Impl (void);
--
-+
+@@ -20192,7 +16952,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
)
-@@ -20224,7 +12284,7 @@
+@@ -20202,7 +16962,7 @@
virtual void base_interfaces (
CORBA_Object *_collocated_tao_target_,
@@ -24209,7 +18038,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -20274,31 +12334,31 @@
+@@ -20252,31 +17012,31 @@
CORBA::SystemException
));
@@ -24252,24 +18081,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -20313,49 +12373,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_InterfaceDef_Proxy_Broker
+@@ -20305,8 +17065,9 @@
{
public:
virtual ~_TAO_InterfaceDef_Proxy_Broker (void);
@@ -24280,48 +18092,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_InterfaceDef_Proxy_Broker (void);
--
-+
+@@ -20315,6 +17076,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_InterfaceDef_Remote_Proxy_Broker : public virtual _TAO_InterfaceDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_InterfaceDef_Remote_Proxy_Broker (void);
--
-+
+@@ -20332,7 +17094,7 @@
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 ()
);
-@@ -20369,24 +12430,15 @@
+@@ -20346,24 +17108,15 @@
static _TAO_InterfaceDef_Remote_Proxy_Broker *the_TAO_InterfaceDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -24342,7 +18136,7 @@
#endif /* ! __GNUC__ || g++ >= 2.8 */
static void _tao_any_destructor (void*);
-@@ -20395,71 +12447,66 @@
+@@ -20372,71 +17125,66 @@
TAO_String_Manager id;
TAO_String_Manager defined_in;
TAO_String_Manager version;
@@ -24365,73 +18159,58 @@
- InterfaceDescription_var (InterfaceDescription *);
- InterfaceDescription_var (const InterfaceDescription_var &); // copy constructor
- ~InterfaceDescription_var (void); // destructor
--
++ 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
+
- InterfaceDescription_var &operator= (InterfaceDescription *);
- InterfaceDescription_var &operator= (const InterfaceDescription_var &);
- InterfaceDescription *operator-> (void);
- const InterfaceDescription *operator-> (void) const;
--
++ 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 InterfaceDescription &() const;
- operator InterfaceDescription &();
- operator InterfaceDescription &() const;
- operator InterfaceDescription *&(); // variable-size types only
--
-- // in, inout, out, _retn
++ 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;
--
--private:
-- InterfaceDescription *ptr_;
--};
--
--class TAO_IFR_Client_Export 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_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 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_;
-- // assignment from T_var not allowed
-- void operator= (const InterfaceDescription_var &);
+- InterfaceDescription *ptr_;
+ IR_InterfaceDescription *ptr_;
};
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InterfaceDescription;
+-class TAO_IFR_Client_Export InterfaceDescription_out
+class TAO_IFR_Client_Export IR_InterfaceDescription_out
-+{
-+public:
+ {
+ 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 &);
@@ -24440,15 +18219,20 @@
+ operator IR_InterfaceDescription *&();
+ IR_InterfaceDescription *&ptr (void);
+ IR_InterfaceDescription *operator-> (void);
-
--struct ValueMember;
--class ValueMember_var;
-+private:
+
+ private:
+- InterfaceDescription *&ptr_;
+ IR_InterfaceDescription *&ptr_;
-+ // assignment from T_var not allowed
+ // 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_IFR_Client_Export ValueMember
+struct TAO_IFR_Client_Export IR_ValueMember
{
@@ -24459,7 +18243,7 @@
#endif /* ! __GNUC__ || g++ >= 2.8 */
static void _tao_any_destructor (void*);
-@@ -20469,326 +12516,266 @@
+@@ -20446,65 +17194,59 @@
TAO_String_Manager defined_in;
TAO_String_Manager version;
CORBA::TypeCode_var type;
@@ -24476,73 +18260,58 @@
- ValueMember_var (ValueMember *);
- ValueMember_var (const ValueMember_var &); // copy constructor
- ~ValueMember_var (void); // destructor
--
++ 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
+
- ValueMember_var &operator= (ValueMember *);
- ValueMember_var &operator= (const ValueMember_var &);
- ValueMember *operator-> (void);
- const ValueMember *operator-> (void) const;
--
++ 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 ValueMember &() const;
- operator ValueMember &();
- operator ValueMember &() const;
- operator ValueMember *&(); // variable-size types only
--
-- // in, inout, out, _retn
++ 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;
--
--private:
-- ValueMember *ptr_;
--};
--
--class TAO_IFR_Client_Export 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_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 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_;
-- // assignment from T_var not allowed
-- void operator= (const ValueMember_var &);
+- ValueMember *ptr_;
+ IR_ValueMember *ptr_;
};
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueMember;
+-class TAO_IFR_Client_Export ValueMember_out
+class TAO_IFR_Client_Export IR_ValueMember_out
-+{
-+public:
+ {
+ 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 &);
@@ -24551,27 +18320,28 @@
+ operator IR_ValueMember *&();
+ IR_ValueMember *&ptr (void);
+ IR_ValueMember *operator-> (void);
-
-+private:
+
+ private:
+- ValueMember *&ptr_;
+ IR_ValueMember *&ptr_;
-+ // assignment from T_var not allowed
+ // 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_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CH_
-
+-
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);
+@@ -20514,244 +17256,190 @@
+ _TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum,
CORBA::ULong length,
- ValueMember *data,
@@ -24593,10 +18363,9 @@
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,
@@ -24609,15 +18378,14 @@
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
--
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_VALUEMEMBERSEQ_CH_)
-#define _IR_VALUEMEMBERSEQ_CH_
-
-class ValueMemberSeq;
-class ValueMemberSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// ValueMemberSeq
+// IR_ValueMemberSeq
@@ -24629,22 +18397,19 @@
_TAO_Unbounded_Sequence_IR_ValueMemberSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Sequence<ValueMember>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Sequence<IR_ValueMember>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- ValueMemberSeq (void); // default ctor
- ValueMemberSeq (CORBA::ULong max); // uses max size
- ValueMemberSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- ValueMember *buffer,
+ IR_ValueMemberSeq (void); // default ctor
+ IR_ValueMemberSeq (CORBA::ULong max); // uses max size
+ IR_ValueMemberSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- ValueMember *buffer,
+ IR_ValueMember *buffer,
CORBA::Boolean release = 0
);
@@ -24680,61 +18445,58 @@
- 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;
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- ValueMemberSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ 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);
+ IR_ValueMemberSeq *_retn (void);
+ IR_ValueMemberSeq *ptr (void) const;
--#if !defined (_IR_VALUEMEMBERSEQ___OUT_CH_)
--#define _IR_VALUEMEMBERSEQ___OUT_CH_
-+private:
+ private:
+- ValueMemberSeq *ptr_;
+ IR_ValueMemberSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_VALUEMEMBERSEQ___OUT_CH_)
+-#define _IR_VALUEMEMBERSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export ValueMemberSeq_out
+class TAO_IFR_Client_Export IR_ValueMemberSeq_out
{
@@ -24748,7 +18510,6 @@
- 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 &);
@@ -24758,7 +18519,7 @@
+ IR_ValueMemberSeq *&ptr (void);
+ IR_ValueMemberSeq *operator-> (void);
+ IR_ValueMember & operator[] (CORBA::ULong index);
-+
+
private:
- ValueMemberSeq *&ptr_;
+ IR_ValueMemberSeq *&ptr_;
@@ -24793,31 +18554,28 @@
- 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 &();
-- // in, inout, out, _retn
++ 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_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
-+
-+ IR_ValueMemberDef_var &operator= (IR_ValueMemberDef_ptr);
-+ IR_ValueMemberDef_var &operator= (const IR_ValueMemberDef_var &);
-+ IR_ValueMemberDef_ptr operator-> (void) const;
-+
-+ operator const IR_ValueMemberDef_ptr &() const;
-+ operator IR_ValueMemberDef_ptr &();
-+ // in, inout, out, _retn
+ IR_ValueMemberDef_ptr in (void) const;
+ IR_ValueMemberDef_ptr &inout (void);
+ IR_ValueMemberDef_ptr &out (void);
@@ -24854,7 +18612,6 @@
- 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 &);
@@ -24864,7 +18621,7 @@
+ operator IR_ValueMemberDef_ptr &();
+ IR_ValueMemberDef_ptr &ptr (void);
+ IR_ValueMemberDef_ptr operator-> (void);
-+
+
private:
- ValueMemberDef_ptr &ptr_;
+ IR_ValueMemberDef_ptr &ptr_;
@@ -24900,15 +18657,13 @@
+ static IR_ValueMemberDef_ptr _duplicate (IR_ValueMemberDef_ptr obj);
+ static IR_ValueMemberDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static ValueMemberDef_ptr _nil (void)
@@ -24919,357 +18674,137 @@
}
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 ((
+@@ -20764,7 +17452,7 @@
CORBA::SystemException
));
- virtual IR::IDLType_ptr type_def (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_IDLType_ptr type_def (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -20796,8 +12783,8 @@
+@@ -20773,7 +17461,7 @@
));
virtual void type_def (
- IR::IDLType_ptr type_def,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_IDLType_ptr type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -20805,7 +12792,7 @@
- ));
-
- virtual CORBA::Visibility access (
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -20814,7 +12801,7 @@
-
- virtual void access (
- CORBA::Visibility access,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -20822,276 +12809,58 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -20811,14 +17499,14 @@
_TAO_ValueMemberDef_Proxy_Broker *the_TAO_ValueMemberDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- ValueMemberDef (
-- TAO_Stub *objref,
+ 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 IR_ValueMemberDef_setup_collocation (int collocated);
+
+- ValueMemberDef (
+ IR_ValueMemberDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -20828,10 +17516,10 @@
+ friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ValueMemberDef_Direct_Proxy_Impl;
+
- virtual ~ValueMemberDef (void);
--private:
++ virtual ~IR_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
--};
++ IR_ValueMemberDef (const IR_ValueMemberDef &);
++ void operator= (const IR_ValueMemberDef &);
--class TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get : public TAO_ClientRequestInfo
--{
--public:
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -20841,7 +17529,7 @@
+ class TAO_ClientRequestInfo_IR_ValueMemberDef_type_get : public TAO_ClientRequestInfo
+ {
+ public:
+- friend class IR::ValueMemberDef;
++ friend class IR_ValueMemberDef;
+
+ friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
+ friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
+@@ -20883,7 +17571,7 @@
+ class TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::ValueMemberDef;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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_ValueMemberDef (void);
+@@ -20917,15 +17605,15 @@
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 &);
+ 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
++ void result (IR_IDLType_ptr result);
+ // update the result
- IR::IDLType_ptr _result;
-+ IR_ValueMemberDef (const IR_ValueMemberDef &);
-+ void operator= (const IR_ValueMemberDef &);
++ IR_IDLType_ptr _result;
};
--class TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set : public TAO_ClientRequestInfo
--{
--public:
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_ValueMemberDef;
+
+ friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
+ friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
+@@ -20934,7 +17622,7 @@
+ TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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));
-+// 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_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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -20960,14 +17648,14 @@
+ 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_;
--
--};
-+///////////////////////////////////////////////////////////////////////
-+// Base Impl. Declaration
-+//
++ IR_IDLType_ptr type_def_;
+
+ };
--class TAO_ClientRequestInfo_IR_ValueMemberDef_access_get : public TAO_ClientRequestInfo
--{
--public:
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
+@@ -21009,7 +17697,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 */
--
--};
--
--
--// The Proxy Implementations are used by each interface to
--// perform a call. Each different implementation encapsulate
--// an invocation logics.
--
--
--///////////////////////////////////////////////////////////////////////
--// Base Impl. Declaration
--//
--
--class TAO_IFR_Client_Export _TAO_ValueMemberDef_Proxy_Impl :
++ friend class IR_ValueMemberDef;
+
+ friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
+ friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
+@@ -21063,7 +17751,7 @@
+ //
+
+ class TAO_IFR_Client_Export _TAO_ValueMemberDef_Proxy_Impl :
- public virtual IR::_TAO_Contained_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_ValueMemberDef_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
- )
-@@ -21099,7 +12868,7 @@
+@@ -21076,7 +17764,7 @@
CORBA::SystemException
)) = 0;
@@ -25278,7 +18813,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -21109,7 +12878,7 @@
+@@ -21086,7 +17774,7 @@
virtual void type_def (
CORBA_Object *_collocated_tao_target_,
@@ -25287,7 +18822,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -21137,6 +12906,7 @@
+@@ -21114,6 +17802,7 @@
_TAO_ValueMemberDef_Proxy_Impl (void);
};
@@ -25295,33 +18830,16 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -21146,26 +12916,26 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_ValueMemberDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_ValueMemberDef_Remote_Proxy_Impl :
+@@ -21126,7 +17815,7 @@
+ class TAO_IFR_Client_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:
- _TAO_ValueMemberDef_Remote_Proxy_Impl (void);
--
-+
- 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 ((
+@@ -21142,7 +17831,7 @@
CORBA::SystemException
));
@@ -25330,7 +18848,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -21175,7 +12945,7 @@
+@@ -21152,7 +17841,7 @@
virtual void type_def (
CORBA_Object *_collocated_tao_target_,
@@ -25339,24 +18857,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -21207,49 +12977,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ValueMemberDef_Proxy_Broker
+@@ -21198,8 +17887,9 @@
{
public:
virtual ~_TAO_ValueMemberDef_Proxy_Broker (void);
@@ -25367,48 +18868,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_ValueMemberDef_Proxy_Broker (void);
--
-+
+@@ -21208,6 +17898,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ValueMemberDef_Remote_Proxy_Broker : public virtual _TAO_ValueMemberDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_ValueMemberDef_Remote_Proxy_Broker (void);
--
-+
+@@ -21225,7 +17916,7 @@
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 ()
);
-@@ -21263,123 +13034,45 @@
+@@ -21239,122 +17930,44 @@
static _TAO_ValueMemberDef_Remote_Proxy_Broker *the_TAO_ValueMemberDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -25511,15 +18994,13 @@
+ static IR_ValueDef_ptr _duplicate (IR_ValueDef_ptr obj);
+ static IR_ValueDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static ValueDef_ptr _nil (void)
@@ -25532,149 +19013,74 @@
static void _tao_any_destructor (void*);
- virtual IR::InterfaceDefSeq * supported_interfaces (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_InterfaceDefSeq * supported_interfaces (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -21387,16 +13080,16 @@
+@@ -21363,7 +17976,7 @@
));
virtual void supported_interfaces (
- const IR::InterfaceDefSeq & supported_interfaces,
-- CORBA::Environment &ACE_TRY_ENV =
+ const IR_InterfaceDefSeq & supported_interfaces,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -21371,7 +17984,7 @@
CORBA::SystemException
));
- virtual IR::InitializerSeq * initializers (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_InitializerSeq * initializers (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -21404,16 +13097,16 @@
+@@ -21380,7 +17993,7 @@
));
virtual void initializers (
- const IR::InitializerSeq & initializers,
-- CORBA::Environment &ACE_TRY_ENV =
+ const IR_InitializerSeq & initializers,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -21388,7 +18001,7 @@
CORBA::SystemException
));
- virtual IR::ValueDef_ptr base_value (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_ValueDef_ptr base_value (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -21421,16 +13114,16 @@
+@@ -21397,7 +18010,7 @@
));
virtual void base_value (
- IR::ValueDef_ptr base_value,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_ValueDef_ptr base_value,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -21405,7 +18018,7 @@
CORBA::SystemException
));
- virtual IR::ValueDefSeq * abstract_base_values (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_ValueDefSeq * abstract_base_values (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -21438,8 +13131,8 @@
+@@ -21414,7 +18027,7 @@
));
virtual void abstract_base_values (
- const IR::ValueDefSeq & abstract_base_values,
-- CORBA::Environment &ACE_TRY_ENV =
+ const IR_ValueDefSeq & abstract_base_values,
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -21447,7 +13140,7 @@
- ));
-
- virtual CORBA::Boolean is_abstract (
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -21456,7 +13149,7 @@
-
- virtual void is_abstract (
- CORBA::Boolean is_abstract,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -21464,7 +13157,7 @@
- ));
-
- virtual CORBA::Boolean is_custom (
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -21473,7 +13166,7 @@
-
- virtual void is_custom (
- CORBA::Boolean is_custom,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -21481,7 +13174,7 @@
- ));
-
- virtual CORBA::Boolean is_truncatable (
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -21490,7 +13183,7 @@
-
- virtual void is_truncatable (
- CORBA::Boolean is_truncatable,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -21499,51 +13192,51 @@
-
- virtual CORBA::Boolean is_a (
- const char * id,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
+@@ -21482,11 +18095,11 @@
CORBA::SystemException
));
@@ -25686,11 +19092,9 @@
- IR::IDLType_ptr type,
+ IR_IDLType_ptr type,
CORBA::Visibility access,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
+@@ -21495,14 +18108,14 @@
CORBA::SystemException
));
@@ -25703,15 +19107,14 @@
- IR::AttributeMode mode,
- const IR::ExceptionDefSeq & get_exceptions,
- const IR::ExceptionDefSeq & put_exceptions,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_IDLType_ptr type,
+ 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 ((
+@@ -21510,15 +18123,15 @@
CORBA::SystemException
));
@@ -25725,1147 +19128,492 @@
- const IR::ParDescriptionSeq & params,
- const IR::ExceptionDefSeq & exceptions,
- const IR::ContextIdSeq & contexts,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_IDLType_ptr result,
+ 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 ((
-@@ -21551,999 +13244,193 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -21539,14 +18152,14 @@
_TAO_ValueDef_Proxy_Broker *the_TAO_ValueDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- ValueDef (
-- TAO_Stub *objref,
+ 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 IR_ValueDef_setup_collocation (int collocated);
+
+- ValueDef (
+ IR_ValueDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -21556,10 +18169,10 @@
+ friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ValueDef_Direct_Proxy_Impl;
+
- virtual ~ValueDef (void);
--private:
++ virtual ~IR_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:
++ IR_ValueDef (const IR_ValueDef &);
++ void operator= (const IR_ValueDef &);
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -21569,7 +18182,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_ValueDef;
+
+ friend class _TAO_ValueDef_Remote_Proxy_Impl;
+ friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+@@ -21603,15 +18216,15 @@
+ 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
++ void result (IR_InterfaceDefSeq * result);
+ // update the result
- IR::InterfaceDefSeq * _result;
--};
++ IR_InterfaceDefSeq * _result;
+ };
--class TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set : public TAO_ClientRequestInfo
--{
--public:
+ class TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::ValueDef;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
+@@ -21620,7 +18233,7 @@
+ TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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));
--
-+ virtual ~IR_ValueDef (void);
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -21646,14 +18259,14 @@
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 &);
+ 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_;
--
-+ IR_ValueDef (const IR_ValueDef &);
-+ void operator= (const IR_ValueDef &);
++ const IR_InterfaceDefSeq & supported_interfaces_;
+
};
--class TAO_ClientRequestInfo_IR_ValueDef_initializers_get : public TAO_ClientRequestInfo
--{
--public:
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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));
-+// 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_get (const TAO_ClientRequestInfo_IR_ValueDef_initializers_get &);
-- void operator= (const TAO_ClientRequestInfo_IR_ValueDef_initializers_get &);
++ friend class IR_ValueDef;
+
+ friend class _TAO_ValueDef_Remote_Proxy_Impl;
+ friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+@@ -21687,15 +18300,15 @@
+ 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
++ void result (IR_InitializerSeq * result);
+ // update the result
- IR::InitializerSeq * _result;
--};
-+///////////////////////////////////////////////////////////////////////
-+// Base Impl. Declaration
-+//
++ IR_InitializerSeq * _result;
+ };
--class TAO_ClientRequestInfo_IR_ValueDef_initializers_set : public TAO_ClientRequestInfo
-+class TAO_IFR_Client_Export _TAO_ValueDef_Proxy_Impl :
-+ public virtual _TAO_Container_Proxy_Impl,
-+ public virtual _TAO_Contained_Proxy_Impl,
-+ public virtual _TAO_IDLType_Proxy_Impl
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_ValueDef;
+
+ friend class _TAO_ValueDef_Remote_Proxy_Impl;
+ friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+@@ -21704,7 +18317,7 @@
+ TAO_ClientRequestInfo_IR_ValueDef_initializers_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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 ~_TAO_ValueDef_Proxy_Impl (void) { }
-
--virtual Dynamic::ExceptionList * exceptions (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
-+ virtual IR_InterfaceDefSeq * supported_interfaces (
-+ 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 supported_interfaces (
-+ CORBA_Object *_collocated_tao_target_,
-+ const IR_InterfaceDefSeq & supported_interfaces,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -21730,14 +18343,14 @@
+ 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_;
--
--};
-+ virtual IR_InitializerSeq * initializers (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--class TAO_ClientRequestInfo_IR_ValueDef_base_value_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;
-+ virtual void initializers (
-+ CORBA_Object *_collocated_tao_target_,
-+ const IR_InitializerSeq & initializers,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--TAO_ClientRequestInfo_IR_ValueDef_base_value_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- CORBA::Environment &ACE_TRY_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 Dynamic::ParameterList * arguments (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
-+ 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 Dynamic::ExceptionList * exceptions (
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- )
-- ACE_THROW_SPEC ((CORBA::SystemException));
-+ virtual IR_ValueDefSeq * abstract_base_values (
-+ 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 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;
++ const IR_InitializerSeq & initializers_;
+
+ };
--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 &);
+ class TAO_ClientRequestInfo_IR_ValueDef_base_value_get : public TAO_ClientRequestInfo
+ {
+ public:
+- friend class IR::ValueDef;
++ friend class IR_ValueDef;
+
+ friend class _TAO_ValueDef_Remote_Proxy_Impl;
+ friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+@@ -21771,15 +18384,15 @@
+ 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
++ void result (IR_ValueDef_ptr result);
+ // update the result
- IR::ValueDef_ptr _result;
--};
-+ virtual CORBA::Boolean is_abstract (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--class TAO_ClientRequestInfo_IR_ValueDef_base_value_set : public TAO_ClientRequestInfo
--{
--public:
++ IR_ValueDef_ptr _result;
+ };
+
+ 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;
-+ virtual void is_abstract (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Boolean is_abstract,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--TAO_ClientRequestInfo_IR_ValueDef_base_value_set (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_ValueDef;
+
+ friend class _TAO_ValueDef_Remote_Proxy_Impl;
+ friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+@@ -21788,7 +18401,7 @@
+ TAO_ClientRequestInfo_IR_ValueDef_base_value_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- IR::ValueDef_ptr base_value,
-- CORBA::Environment &ACE_TRY_ENV =
-- TAO_default_environment ()
-- );
-+ virtual CORBA::Boolean is_custom (
-+ 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 is_custom (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Boolean is_custom,
-+ 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 CORBA::Boolean is_truncatable (
-+ 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 is_truncatable (
-+ CORBA_Object *_collocated_tao_target_,
-+ CORBA::Boolean is_truncatable,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -21814,14 +18427,14 @@
+ 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_;
--
--};
-+ virtual CORBA::Boolean is_a (
-+ CORBA_Object *_collocated_tao_target_,
-+ const char * id,
-+ CORBA::Environment &ACE_TRY_ENV
-+ )
-+ ACE_THROW_SPEC ((
-+ CORBA::SystemException
-+ )) = 0;
-
--class TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_ValueDef;
+
+ friend class _TAO_ValueDef_Remote_Proxy_Impl;
+ friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+@@ -21855,15 +18468,15 @@
+ 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
++ void result (IR_ValueDefSeq * result);
+ // update the result
- IR::ValueDefSeq * _result;
--};
--
--class TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_ValueDef;
+
+ friend class _TAO_ValueDef_Remote_Proxy_Impl;
+ friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+@@ -21872,7 +18485,7 @@
+ TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -21898,14 +18511,14 @@
+ 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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
+@@ -21947,7 +18560,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
+@@ -21989,7 +18602,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
+@@ -22031,7 +18644,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
+@@ -22073,7 +18686,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
+@@ -22115,7 +18728,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
+@@ -22157,7 +18770,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
+@@ -22201,7 +18814,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++ friend class IR_ValueDef;
+
+ friend class _TAO_ValueDef_Remote_Proxy_Impl;
+ friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+@@ -22213,7 +18826,7 @@
+ 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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -22243,17 +18856,17 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
- IR::IDLType_ptr type_;
-- const CORBA::Visibility & access_;
++ IR_IDLType_ptr type_;
+ const CORBA::Visibility & access_;
- void result (IR::ValueMemberDef_ptr result);
-- // update the result
++ void result (IR_ValueMemberDef_ptr result);
+ // update the result
- IR::ValueMemberDef_ptr _result;
--};
--
--class TAO_ClientRequestInfo_IR_ValueDef_create_attribute : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++ friend class IR_ValueDef;
+
+ friend class _TAO_ValueDef_Remote_Proxy_Impl;
+ friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+@@ -22265,10 +18878,10 @@
+ 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,
++ IR_AttributeMode & mode,
++ const IR_ExceptionDefSeq & get_exceptions,
++ const IR_ExceptionDefSeq & put_exceptions,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -22297,19 +18910,19 @@
+ 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_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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++ friend class IR_ValueDef;
+
+ friend class _TAO_ValueDef_Remote_Proxy_Impl;
+ friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+@@ -22321,11 +18934,11 @@
+ 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,
++ IR_OperationMode & mode,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -22354,14 +18967,14 @@
+ 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_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_IFR_Client_Export _TAO_ValueDef_Proxy_Impl :
++ IR_OperationDef_ptr _result;
+ };
+
+ #endif /* TAO_HAS_INTERCEPTORS */
+@@ -22379,14 +18992,14 @@
+ //
+
+ class TAO_IFR_Client_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) { }
--
++ 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;
--
-- virtual void supported_interfaces (
-- CORBA_Object *_collocated_tao_target_,
++ virtual IR_InterfaceDefSeq * supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -22396,14 +19009,14 @@
+
+ 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;
--
++ 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_,
++ virtual IR_InitializerSeq * initializers (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -22413,14 +19026,14 @@
+
+ virtual void initializers (
+ CORBA_Object *_collocated_tao_target_,
- const IR::InitializerSeq & initializers,
-- CORBA::Environment &ACE_TRY_ENV
-- )
-- ACE_THROW_SPEC ((
-- CORBA::SystemException
-- )) = 0;
--
++ 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_,
++ virtual IR_ValueDef_ptr base_value (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -22430,14 +19043,14 @@
+
+ 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;
--
++ 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_,
++ virtual IR_ValueDefSeq * abstract_base_values (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -22447,7 +19060,7 @@
+
+ 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;
--
++ const IR_ValueDefSeq & abstract_base_values,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -22514,12 +19127,12 @@
+ CORBA::SystemException
+ )) = 0;
+
- virtual IR::ValueMemberDef_ptr create_value_member (
+ virtual IR_ValueMemberDef_ptr create_value_member (
CORBA_Object *_collocated_tao_target_,
@@ -26877,7 +19625,7 @@
CORBA::Visibility access,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -22551,31 +13438,31 @@
+@@ -22527,31 +19140,31 @@
CORBA::SystemException
)) = 0;
@@ -26920,7 +19668,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -22586,6 +13473,7 @@
+@@ -22562,6 +19175,7 @@
_TAO_ValueDef_Proxy_Impl (void);
};
@@ -26928,36 +19676,29 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -22595,20 +13483,20 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_ValueDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_ValueDef_Remote_Proxy_Impl :
+@@ -22574,9 +19188,9 @@
+ class TAO_IFR_Client_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:
- _TAO_ValueDef_Remote_Proxy_Impl (void);
--
-+
+@@ -22584,7 +19198,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
)
-@@ -22618,14 +13506,14 @@
+@@ -22594,14 +19208,14 @@
virtual void supported_interfaces (
CORBA_Object *_collocated_tao_target_,
@@ -26974,7 +19715,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -22635,14 +13523,14 @@
+@@ -22611,14 +19225,14 @@
virtual void initializers (
CORBA_Object *_collocated_tao_target_,
@@ -26991,7 +19732,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -22652,14 +13540,14 @@
+@@ -22628,14 +19242,14 @@
virtual void base_value (
CORBA_Object *_collocated_tao_target_,
@@ -27008,7 +19749,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -22669,7 +13557,7 @@
+@@ -22645,7 +19259,7 @@
virtual void abstract_base_values (
CORBA_Object *_collocated_tao_target_,
@@ -27017,7 +19758,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -22736,12 +13624,12 @@
+@@ -22712,12 +19326,12 @@
CORBA::SystemException
));
@@ -27032,7 +19773,7 @@
CORBA::Visibility access,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -22749,31 +13637,31 @@
+@@ -22725,31 +19339,31 @@
CORBA::SystemException
));
@@ -27075,24 +19816,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -22788,49 +13676,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ValueDef_Proxy_Broker
+@@ -22778,8 +19392,9 @@
{
public:
virtual ~_TAO_ValueDef_Proxy_Broker (void);
@@ -27103,48 +19827,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_ValueDef_Proxy_Broker (void);
--
-+
+@@ -22788,6 +19403,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ValueDef_Remote_Proxy_Broker : public virtual _TAO_ValueDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_ValueDef_Remote_Proxy_Broker (void);
--
-+
+@@ -22805,7 +19421,7 @@
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 ()
);
-@@ -22844,24 +13733,15 @@
+@@ -22819,24 +19435,15 @@
static _TAO_ValueDef_Remote_Proxy_Broker *the_TAO_ValueDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -27165,7 +19871,7 @@
#endif /* ! __GNUC__ || g++ >= 2.8 */
static void _tao_any_destructor (void*);
-@@ -22872,173 +13752,99 @@
+@@ -22847,172 +19454,98 @@
CORBA::Boolean is_custom;
TAO_String_Manager defined_in;
TAO_String_Manager version;
@@ -27194,31 +19900,50 @@
- ValueDescription_var (ValueDescription *);
- ValueDescription_var (const ValueDescription_var &); // copy constructor
- ~ValueDescription_var (void); // destructor
--
++ 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
+
- ValueDescription_var &operator= (ValueDescription *);
- ValueDescription_var &operator= (const ValueDescription_var &);
- ValueDescription *operator-> (void);
- const ValueDescription *operator-> (void) const;
--
++ 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 ValueDescription &() const;
- operator ValueDescription &();
- operator ValueDescription &() const;
- operator ValueDescription *&(); // variable-size types only
--
-- // in, inout, out, _retn
++ 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;
--
--private:
++ 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_IFR_Client_Export ValueDescription_out
--{
--public:
++class TAO_IFR_Client_Export IR_ValueDescription_out
+ {
+ public:
- ValueDescription_out (ValueDescription *&);
- ValueDescription_out (ValueDescription_var &);
- ValueDescription_out (const ValueDescription_out &);
@@ -27227,10 +19952,19 @@
- operator ValueDescription *&();
- ValueDescription *&ptr (void);
- ValueDescription *operator-> (void);
--
--private:
++ 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_;
-- // assignment from T_var not allowed
++ IR_ValueDescription *&ptr_;
+ // assignment from T_var not allowed
- void operator= (const ValueDescription_var &);
-};
-
@@ -27239,24 +19973,12 @@
-
-#if !defined (_IR_VALUEBOXDEF___PTR_CH_)
-#define _IR_VALUEBOXDEF___PTR_CH_
-+ 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
-
+-
-class ValueBoxDef;
-typedef ValueBoxDef *ValueBoxDef_ptr;
-+ IR_ValueDescription_var &operator= (IR_ValueDescription *);
-+ IR_ValueDescription_var &operator= (const IR_ValueDescription_var &);
-+ IR_ValueDescription *operator-> (void);
-+ const IR_ValueDescription *operator-> (void) const;
-
+-
-#endif /* end #if !defined */
-+ operator const IR_ValueDescription &() const;
-+ operator IR_ValueDescription &();
-+ operator IR_ValueDescription &() const;
-+ operator IR_ValueDescription *&(); // variable-size types only
-
+-
-
-#if !defined (_IR_VALUEBOXDEF___VAR_CH_)
-#define _IR_VALUEBOXDEF___VAR_CH_
@@ -27281,21 +20003,14 @@
- ValueBoxDef_ptr &out (void);
- ValueBoxDef_ptr _retn (void);
- ValueBoxDef_ptr ptr (void) const;
-+ // in, inout, out, _retn
-+ const IR_ValueDescription &in (void) const;
-+ IR_ValueDescription &inout (void);
-+ IR_ValueDescription *&out (void);
-+ IR_ValueDescription *_retn (void);
-+ IR_ValueDescription *ptr (void) const;
-
- private:
+-
+-private:
- ValueBoxDef_ptr ptr_;
- // Unimplemented - prevents widening assignment.
- ValueBoxDef_var (const TAO_Base_var &rhs);
- ValueBoxDef_var &operator= (const TAO_Base_var &rhs);
-+ IR_ValueDescription *ptr_;
- };
-
+-};
+-
-
-#endif /* end #if !defined */
-
@@ -27304,9 +20019,8 @@
-#define _IR_VALUEBOXDEF___OUT_CH_
-
-class TAO_IFR_Client_Export ValueBoxDef_out
-+class TAO_IFR_Client_Export IR_ValueDescription_out
- {
- public:
+-{
+-public:
- ValueBoxDef_out (ValueBoxDef_ptr &);
- ValueBoxDef_out (ValueBoxDef_var &);
- ValueBoxDef_out (const ValueBoxDef_out &);
@@ -27317,19 +20031,8 @@
- ValueBoxDef_ptr &ptr (void);
- ValueBoxDef_ptr 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:
+-private:
- ValueBoxDef_ptr &ptr_;
-+ IR_ValueDescription *&ptr_;
-+ // assignment from T_var not allowed
+ void operator= (const IR_ValueDescription_var &);
};
@@ -27363,15 +20066,13 @@
+ static IR_ValueBoxDef_ptr _duplicate (IR_ValueBoxDef_ptr obj);
+ static IR_ValueBoxDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static ValueBoxDef_ptr _nil (void)
@@ -27384,191 +20085,112 @@
static void _tao_any_destructor (void*);
- virtual IR::IDLType_ptr original_type_def (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_IDLType_ptr original_type_def (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -23046,8 +13852,8 @@
+@@ -23021,7 +19554,7 @@
));
virtual void original_type_def (
- IR::IDLType_ptr original_type_def,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_IDLType_ptr original_type_def,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -23055,131 +13861,39 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -23042,14 +19575,14 @@
_TAO_ValueBoxDef_Proxy_Broker *the_TAO_ValueBoxDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- ValueBoxDef (
-- TAO_Stub *objref,
+ 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 IR_ValueBoxDef_setup_collocation (int collocated);
+
+- ValueBoxDef (
+ IR_ValueBoxDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -23059,10 +19592,10 @@
+ friend class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ValueBoxDef_Direct_Proxy_Impl;
+
- virtual ~ValueBoxDef (void);
--private:
++ virtual ~IR_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:
++ IR_ValueBoxDef (const IR_ValueBoxDef &);
++ void operator= (const IR_ValueBoxDef &);
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -23072,7 +19605,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_ValueBoxDef;
+
+ friend class _TAO_ValueBoxDef_Remote_Proxy_Impl;
+ friend class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl;
+@@ -23106,15 +19639,15 @@
+ 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
++ void result (IR_IDLType_ptr result);
+ // update the result
- IR::IDLType_ptr _result;
--};
++ IR_IDLType_ptr _result;
+ };
--class TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set : public TAO_ClientRequestInfo
--{
--public:
+ class TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::ValueBoxDef;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
+@@ -23123,7 +19656,7 @@
+ TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _tao_target,
- 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_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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -23149,7 +19682,7 @@
+ 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 */
--
-+ virtual ~IR_ValueBoxDef (void);
-+private:
-+ IR_ValueBoxDef (const IR_ValueBoxDef &);
-+ void operator= (const IR_ValueBoxDef &);
++ IR_IDLType_ptr original_type_def_;
+
};
-
-@@ -23192,13 +13906,13 @@
- // Base Impl. Declaration
+@@ -23168,12 +19701,12 @@
//
--class TAO_IFR_Client_Export _TAO_ValueBoxDef_Proxy_Impl :
+ class TAO_IFR_Client_Export _TAO_ValueBoxDef_Proxy_Impl :
- public virtual IR::_TAO_TypedefDef_Proxy_Impl
-+class TAO_IFR_Client_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 (
-+
+ virtual IR_IDLType_ptr original_type_def (
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -23208,7 +13922,7 @@
+@@ -23183,7 +19716,7 @@
virtual void original_type_def (
CORBA_Object *_collocated_tao_target_,
@@ -27577,7 +20199,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -23219,6 +13933,7 @@
+@@ -23194,6 +19727,7 @@
_TAO_ValueBoxDef_Proxy_Impl (void);
};
@@ -27585,35 +20207,25 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -23228,20 +13943,20 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_ValueBoxDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_ValueBoxDef_Remote_Proxy_Impl :
+@@ -23206,7 +19740,7 @@
+ class TAO_IFR_Client_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:
- _TAO_ValueBoxDef_Remote_Proxy_Impl (void);
--
-+
+@@ -23214,7 +19748,7 @@
+
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
+ CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
- CORBA::SystemException
-@@ -23249,7 +13964,7 @@
+@@ -23224,7 +19758,7 @@
virtual void original_type_def (
CORBA_Object *_collocated_tao_target_,
@@ -27622,24 +20234,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -23264,49 +13979,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ValueBoxDef_Proxy_Broker
+@@ -23253,8 +19787,9 @@
{
public:
virtual ~_TAO_ValueBoxDef_Proxy_Broker (void);
@@ -27650,48 +20245,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_ValueBoxDef_Proxy_Broker (void);
--
-+
+@@ -23263,6 +19798,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ValueBoxDef_Remote_Proxy_Broker : public virtual _TAO_ValueBoxDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_ValueBoxDef_Remote_Proxy_Broker (void);
--
-+
+@@ -23280,7 +19816,7 @@
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 ()
);
-@@ -23320,123 +14036,45 @@
+@@ -23294,122 +19830,44 @@
static _TAO_ValueBoxDef_Remote_Proxy_Broker *the_TAO_ValueBoxDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -27794,15 +20371,13 @@
+ static IR_ProvidesDef_ptr _duplicate (IR_ProvidesDef_ptr obj);
+ static IR_ProvidesDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static ProvidesDef_ptr _nil (void)
@@ -27815,141 +20390,78 @@
static void _tao_any_destructor (void*);
- virtual IR::InterfaceDef_ptr interface_type (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_InterfaceDef_ptr interface_type (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -23444,89 +14082,39 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -23430,14 +19888,14 @@
_TAO_ProvidesDef_Proxy_Broker *the_TAO_ProvidesDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- ProvidesDef (
-- TAO_Stub *objref,
+ 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 IR_ProvidesDef_setup_collocation (int collocated);
+
+- ProvidesDef (
+ IR_ProvidesDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -23447,10 +19905,10 @@
+ friend class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ProvidesDef_Direct_Proxy_Impl;
+
- virtual ~ProvidesDef (void);
--private:
++ virtual ~IR_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:
++ IR_ProvidesDef (const IR_ProvidesDef &);
++ void operator= (const IR_ProvidesDef &);
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -23460,7 +19918,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_ProvidesDef;
+
+ friend class _TAO_ProvidesDef_Remote_Proxy_Impl;
+ friend class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
+@@ -23494,9 +19952,9 @@
+ 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
++ void result (IR_InterfaceDef_ptr result);
+ // update the result
- IR::InterfaceDef_ptr _result;
--};
-
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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 &);
++ IR_InterfaceDef_ptr _result;
};
-
-@@ -23539,13 +14127,13 @@
- // Base Impl. Declaration
+ #endif /* TAO_HAS_INTERCEPTORS */
+@@ -23514,12 +19972,12 @@
//
--class TAO_IFR_Client_Export _TAO_ProvidesDef_Proxy_Impl :
+ class TAO_IFR_Client_Export _TAO_ProvidesDef_Proxy_Impl :
- public virtual IR::_TAO_Contained_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_ProvidesDef_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
)
-@@ -23557,6 +14145,7 @@
+@@ -23531,6 +19989,7 @@
_TAO_ProvidesDef_Proxy_Impl (void);
};
@@ -27957,49 +20469,25 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -23566,18 +14155,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_ProvidesDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_ProvidesDef_Remote_Proxy_Impl :
+@@ -23543,7 +20002,7 @@
+ class TAO_IFR_Client_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:
- _TAO_ProvidesDef_Remote_Proxy_Impl (void);
--
-+
+@@ -23551,7 +20010,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
)
-@@ -23593,49 +14182,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ProvidesDef_Proxy_Broker
+@@ -23581,8 +20040,9 @@
{
public:
virtual ~_TAO_ProvidesDef_Proxy_Broker (void);
@@ -28010,48 +20498,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_ProvidesDef_Proxy_Broker (void);
--
-+
+@@ -23591,6 +20051,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ProvidesDef_Remote_Proxy_Broker : public virtual _TAO_ProvidesDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_ProvidesDef_Remote_Proxy_Broker (void);
--
-+
+@@ -23608,7 +20069,7 @@
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 ()
);
-@@ -23649,24 +14239,15 @@
+@@ -23622,190 +20083,107 @@
static _TAO_ProvidesDef_Remote_Proxy_Broker *the_TAO_ProvidesDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -28068,22 +20538,20 @@
#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*);
-@@ -23675,165 +14256,91 @@
- TAO_String_Manager id;
- TAO_String_Manager defined_in;
- TAO_String_Manager version;
+-#endif /* ! __GNUC__ || g++ >= 2.8 */
+-
+- static void _tao_any_destructor (void*);
+-
+- TAO_String_Manager name;
+- 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_IFR_Client_Export ProvidesDescription_var
-+class TAO_IFR_Client_Export IR_ProvidesDescription_var
- {
- public:
+-{
+-public:
- ProvidesDescription_var (void); // default constructor
- ProvidesDescription_var (ProvidesDescription *);
- ProvidesDescription_var (const ProvidesDescription_var &); // copy constructor
@@ -28133,49 +20601,59 @@
-
-#if !defined (_IR_USESDEF___PTR_CH_)
-#define _IR_USESDEF___PTR_CH_
-+ 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
-
+-
-class UsesDef;
-typedef UsesDef *UsesDef_ptr;
-+ IR_ProvidesDescription_var &operator= (IR_ProvidesDescription *);
-+ IR_ProvidesDescription_var &operator= (const IR_ProvidesDescription_var &);
-+ IR_ProvidesDescription *operator-> (void);
-+ const IR_ProvidesDescription *operator-> (void) const;
-
+-
-#endif /* end #if !defined */
-+ operator const IR_ProvidesDescription &() const;
-+ operator IR_ProvidesDescription &();
-+ operator IR_ProvidesDescription &() const;
-+ operator IR_ProvidesDescription *&(); // variable-size types only
++ typedef IR_ProvidesDescription_var _var_type;
++#endif /* ! __GNUC__ || g++ >= 2.8 */
+
++ static void _tao_any_destructor (void*);
--
-#if !defined (_IR_USESDEF___VAR_CH_)
-#define _IR_USESDEF___VAR_CH_
--
++ TAO_String_Manager name;
++ TAO_String_Manager id;
++ TAO_String_Manager defined_in;
++ TAO_String_Manager version;
++ IR_InterfaceDef_var interface_type;
++};
+
-class TAO_IFR_Client_Export UsesDef_var : public TAO_Base_var
--{
--public:
++class TAO_IFR_Client_Export IR_ProvidesDescription_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_ProvidesDescription_var (void); // default constructor
++ 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;
+
- UsesDef_var &operator= (UsesDef_ptr);
- UsesDef_var &operator= (const UsesDef_var &);
- UsesDef_ptr operator-> (void) const;
--
++ operator const IR_ProvidesDescription &() const;
++ operator IR_ProvidesDescription &();
++ operator IR_ProvidesDescription &() const;
++ operator IR_ProvidesDescription *&(); // variable-size types only
+
- operator const UsesDef_ptr &() const;
- operator UsesDef_ptr &();
-- // in, inout, out, _retn
+ // 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;
-+ // in, inout, out, _retn
+ const IR_ProvidesDescription &in (void) const;
+ IR_ProvidesDescription &inout (void);
+ IR_ProvidesDescription *&out (void);
@@ -28210,7 +20688,6 @@
- operator UsesDef_ptr &();
- UsesDef_ptr &ptr (void);
- UsesDef_ptr operator-> (void);
--
+ IR_ProvidesDescription_out (IR_ProvidesDescription *&);
+ IR_ProvidesDescription_out (IR_ProvidesDescription_var &);
+ IR_ProvidesDescription_out (const IR_ProvidesDescription_out &);
@@ -28219,7 +20696,7 @@
+ operator IR_ProvidesDescription *&();
+ IR_ProvidesDescription *&ptr (void);
+ IR_ProvidesDescription *operator-> (void);
-+
+
private:
- UsesDef_ptr &ptr_;
+ IR_ProvidesDescription *&ptr_;
@@ -28257,15 +20734,13 @@
+ static IR_UsesDef_ptr _duplicate (IR_UsesDef_ptr obj);
+ static IR_UsesDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static UsesDef_ptr _nil (void)
@@ -28278,189 +20753,85 @@
static void _tao_any_destructor (void*);
- virtual IR::InterfaceDef_ptr interface_type (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_InterfaceDef_ptr interface_type (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -23841,7 +14348,7 @@
- ));
-
- virtual CORBA::Boolean is_multiple (
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -23849,131 +14356,39 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -23834,14 +20212,14 @@
_TAO_UsesDef_Proxy_Broker *the_TAO_UsesDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- UsesDef (
-- TAO_Stub *objref,
+ 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 IR_UsesDef_setup_collocation (int collocated);
+
+- UsesDef (
+ IR_UsesDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -23851,10 +20229,10 @@
+ friend class _TAO_UsesDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_UsesDef_Direct_Proxy_Impl;
+
- virtual ~UsesDef (void);
--private:
++ virtual ~IR_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:
++ IR_UsesDef (const IR_UsesDef &);
++ void operator= (const IR_UsesDef &);
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -23864,7 +20242,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_UsesDef;
+
+ friend class _TAO_UsesDef_Remote_Proxy_Impl;
+ friend class _TAO_UsesDef_ThruPOA_Proxy_Impl;
+@@ -23898,15 +20276,15 @@
+ 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
++ void result (IR_InterfaceDef_ptr result);
+ // update the result
- IR::InterfaceDef_ptr _result;
--};
++ IR_InterfaceDef_ptr _result;
+ };
--class TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get : public TAO_ClientRequestInfo
--{
--public:
+ class TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::UsesDef;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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_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 */
--
-+ virtual ~IR_UsesDef (void);
-+private:
-+ IR_UsesDef (const IR_UsesDef &);
-+ void operator= (const IR_UsesDef &);
- };
-
-
-@@ -23986,13 +14401,13 @@
- // Base Impl. Declaration
+@@ -23960,12 +20338,12 @@
//
--class TAO_IFR_Client_Export _TAO_UsesDef_Proxy_Impl :
+ class TAO_IFR_Client_Export _TAO_UsesDef_Proxy_Impl :
- public virtual IR::_TAO_Contained_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_UsesDef_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
)
-@@ -24012,6 +14427,7 @@
+@@ -23985,6 +20363,7 @@
_TAO_UsesDef_Proxy_Impl (void);
};
@@ -28468,49 +20839,25 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -24021,18 +14437,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_UsesDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_UsesDef_Remote_Proxy_Impl :
+@@ -23997,7 +20376,7 @@
+ class TAO_IFR_Client_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:
- _TAO_UsesDef_Remote_Proxy_Impl (void);
--
-+
+@@ -24005,7 +20384,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
)
-@@ -24056,49 +14472,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_UsesDef_Proxy_Broker
+@@ -24043,8 +20422,9 @@
{
public:
virtual ~_TAO_UsesDef_Proxy_Broker (void);
@@ -28521,48 +20868,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_UsesDef_Proxy_Broker (void);
--
-+
+@@ -24053,6 +20433,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_UsesDef_Remote_Proxy_Broker : public virtual _TAO_UsesDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_UsesDef_Remote_Proxy_Broker (void);
--
-+
+@@ -24070,7 +20451,7 @@
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 ()
);
-@@ -24112,24 +14529,15 @@
+@@ -24084,24 +20465,15 @@
static _TAO_UsesDef_Remote_Proxy_Broker *the_TAO_UsesDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -28583,7 +20912,7 @@
#endif /* ! __GNUC__ || g++ >= 2.8 */
static void _tao_any_destructor (void*);
-@@ -24138,479 +14546,343 @@
+@@ -24110,65 +20482,59 @@
TAO_String_Manager id;
TAO_String_Manager defined_in;
TAO_String_Manager version;
@@ -28600,73 +20929,58 @@
- UsesDescription_var (UsesDescription *);
- UsesDescription_var (const UsesDescription_var &); // copy constructor
- ~UsesDescription_var (void); // destructor
--
++ 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
+
- UsesDescription_var &operator= (UsesDescription *);
- UsesDescription_var &operator= (const UsesDescription_var &);
- UsesDescription *operator-> (void);
- const UsesDescription *operator-> (void) const;
--
++ 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 UsesDescription &() const;
- operator UsesDescription &();
- operator UsesDescription &() const;
- operator UsesDescription *&(); // variable-size types only
--
-- // in, inout, out, _retn
++ 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;
--
--private:
-- UsesDescription *ptr_;
--};
--
--class TAO_IFR_Client_Export 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_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 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_;
-- // assignment from T_var not allowed
-- void operator= (const UsesDescription_var &);
+- UsesDescription *ptr_;
+ IR_UsesDescription *ptr_;
};
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsesDescription;
+-class TAO_IFR_Client_Export UsesDescription_out
+class TAO_IFR_Client_Export IR_UsesDescription_out
-+{
-+public:
+ {
+ 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 &);
@@ -28675,27 +20989,28 @@
+ operator IR_UsesDescription *&();
+ IR_UsesDescription *&ptr (void);
+ IR_UsesDescription *operator-> (void);
-
-+private:
+
+ private:
+- UsesDescription *&ptr_;
+ IR_UsesDescription *&ptr_;
-+ // assignment from T_var not allowed
+ // 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;
+-
+-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
+
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CH_
-
+-
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);
+@@ -24178,149 +20544,118 @@
+ _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum,
CORBA::ULong length,
- ProvidesDescription *data,
@@ -28717,10 +21032,9 @@
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,
@@ -28733,15 +21047,14 @@
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
--
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_PROVIDESDESCSEQ_CH_)
-#define _IR_PROVIDESDESCSEQ_CH_
-
-class ProvidesDescSeq;
-class ProvidesDescSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// ProvidesDescSeq
+// IR_ProvidesDescSeq
@@ -28753,22 +21066,19 @@
_TAO_Unbounded_Sequence_IR_ProvidesDescSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Sequence<ProvidesDescription>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Sequence<IR_ProvidesDescription>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- ProvidesDescSeq (void); // default ctor
- ProvidesDescSeq (CORBA::ULong max); // uses max size
- ProvidesDescSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- ProvidesDescription *buffer,
+ IR_ProvidesDescSeq (void); // default ctor
+ IR_ProvidesDescSeq (CORBA::ULong max); // uses max size
+ IR_ProvidesDescSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- ProvidesDescription *buffer,
+ IR_ProvidesDescription *buffer,
CORBA::Boolean release = 0
);
@@ -28804,61 +21114,58 @@
- 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;
--
-- // in, inout, out, _retn
++ 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;
-+ 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
-
--private:
-- ProvidesDescSeq *ptr_;
--};
-+ 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
-
--#endif /* end #if !defined */
-+ 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);
+ IR_ProvidesDescSeq *_retn (void);
+ IR_ProvidesDescSeq *ptr (void) const;
--#if !defined (_IR_PROVIDESDESCSEQ___OUT_CH_)
--#define _IR_PROVIDESDESCSEQ___OUT_CH_
-+private:
+ private:
+- ProvidesDescSeq *ptr_;
+ IR_ProvidesDescSeq *ptr_;
-+};
+ };
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_IR_PROVIDESDESCSEQ___OUT_CH_)
+-#define _IR_PROVIDESDESCSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export ProvidesDescSeq_out
+class TAO_IFR_Client_Export IR_ProvidesDescSeq_out
{
@@ -28872,7 +21179,6 @@
- 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 &);
@@ -28882,7 +21188,7 @@
+ IR_ProvidesDescSeq *&ptr (void);
+ IR_ProvidesDescSeq *operator-> (void);
+ IR_ProvidesDescription & operator[] (CORBA::ULong index);
-+
+
private:
- ProvidesDescSeq *&ptr_;
+ IR_ProvidesDescSeq *&ptr_;
@@ -28898,19 +21204,15 @@
-
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--
+
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CH_
-
+-
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);
+@@ -24330,244 +20665,145 @@
+ _TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum,
CORBA::ULong length,
- UsesDescription *data,
@@ -28932,10 +21234,9 @@
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,
@@ -28948,15 +21249,14 @@
-#endif /* end #if !defined */
-
-
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
--
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
-#if !defined (_IR_USESDESCSEQ_CH_)
-#define _IR_USESDESCSEQ_CH_
-
-class UsesDescSeq;
-class UsesDescSeq_var;
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+-
// *************************************************************
-// UsesDescSeq
+// IR_UsesDescSeq
@@ -28968,22 +21268,19 @@
_TAO_Unbounded_Sequence_IR_UsesDescSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Sequence<UsesDescription>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Sequence<IR_UsesDescription>
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
- UsesDescSeq (void); // default ctor
- UsesDescSeq (CORBA::ULong max); // uses max size
- UsesDescSeq (
-- CORBA::ULong max,
-- CORBA::ULong length,
-- UsesDescription *buffer,
+ IR_UsesDescSeq (void); // default ctor
+ IR_UsesDescSeq (CORBA::ULong max); // uses max size
+ IR_UsesDescSeq (
-+ CORBA::ULong max,
-+ CORBA::ULong length,
+ CORBA::ULong max,
+ CORBA::ULong length,
+- UsesDescription *buffer,
+ IR_UsesDescription *buffer,
CORBA::Boolean release = 0
);
@@ -29019,61 +21316,62 @@
- 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;
--
-- // in, inout, out, _retn
++ 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;
--
--private:
-- UsesDescSeq *ptr_;
--};
-+ 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
-
-+ IR_UsesDescSeq_var &operator= (IR_UsesDescSeq *);
-+ IR_UsesDescSeq_var &operator= (const IR_UsesDescSeq_var &);
-+ IR_UsesDescSeq *operator-> (void);
-+ const IR_UsesDescSeq *operator-> (void) const;
-
--#endif /* end #if !defined */
-+ 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);
-+ const IR_UsesDescription & operator[] (CORBA::ULong index) const;
-
--#if !defined (_IR_USESDESCSEQ___OUT_CH_)
--#define _IR_USESDESCSEQ___OUT_CH_
-+ // in, inout, out, _retn
+ 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 (_IR_USESDESCSEQ___OUT_CH_)
+-#define _IR_USESDESCSEQ___OUT_CH_
+-
-class TAO_IFR_Client_Export UsesDescSeq_out
--{
--public:
++class TAO_IFR_Client_Export IR_UsesDescSeq_out
+ {
+ public:
- UsesDescSeq_out (UsesDescSeq *&);
- UsesDescSeq_out (UsesDescSeq_var &);
- UsesDescSeq_out (const UsesDescSeq_out &);
@@ -29083,14 +21381,23 @@
- 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_;
-- // assignment from T_var not allowed
++ IR_UsesDescSeq *&ptr_;
+ // assignment from T_var not allowed
- void operator= (const UsesDescSeq_var &);
-+ IR_UsesDescSeq *ptr_;
- };
-
+-};
+-
-
-#endif /* end #if !defined */
-
@@ -29110,9 +21417,8 @@
-#define _IR_EVENTDEF___VAR_CH_
-
-class TAO_IFR_Client_Export EventDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_UsesDescSeq_out
- {
- public:
+-{
+-public:
- EventDef_var (void); // default constructor
- EventDef_var (EventDef_ptr p) : ptr_ (p) {}
- EventDef_var (const EventDef_var &); // copy constructor
@@ -29140,16 +21446,7 @@
-
-
-#endif /* end #if !defined */
-+ 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);
-
+-
-
-#if !defined (_IR_EVENTDEF___OUT_CH_)
-#define _IR_EVENTDEF___OUT_CH_
@@ -29167,10 +21464,8 @@
- EventDef_ptr &ptr (void);
- EventDef_ptr operator-> (void);
-
- private:
+-private:
- EventDef_ptr &ptr_;
-+ IR_UsesDescSeq *&ptr_;
-+ // assignment from T_var not allowed
+ void operator= (const IR_UsesDescSeq_var &);
};
@@ -29204,15 +21499,13 @@
+ static IR_EventDef_ptr _duplicate (IR_EventDef_ptr obj);
+ static IR_EventDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static EventDef_ptr _nil (void)
@@ -29223,194 +21516,86 @@
}
static void _tao_any_destructor (void*);
-
- 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 ((
+@@ -24581,7 +20817,7 @@
CORBA::SystemException
));
- virtual IR::ValueDef_ptr event (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_ValueDef_ptr event (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -24618,133 +14890,39 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -24602,14 +20838,14 @@
_TAO_EventDef_Proxy_Broker *the_TAO_EventDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- EventDef (
-- TAO_Stub *objref,
+ 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 IR_EventDef_setup_collocation (int collocated);
+
+- EventDef (
+ IR_EventDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -24619,10 +20855,10 @@
+ friend class _TAO_EventDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_EventDef_Direct_Proxy_Impl;
+
- virtual ~EventDef (void);
--private:
++ virtual ~IR_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
--};
++ IR_EventDef (const IR_EventDef &);
++ void operator= (const IR_EventDef &);
--class TAO_ClientRequestInfo_IR_EventDef_event_get : public TAO_ClientRequestInfo
--{
--public:
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -24632,7 +20868,7 @@
+ class TAO_ClientRequestInfo_IR_EventDef_is_a : public TAO_ClientRequestInfo
+ {
+ public:
+- friend class IR::EventDef;
++ friend class IR_EventDef;
+
+ friend class _TAO_EventDef_Remote_Proxy_Impl;
+ friend class _TAO_EventDef_ThruPOA_Proxy_Impl;
+@@ -24676,7 +20912,7 @@
+ class TAO_ClientRequestInfo_IR_EventDef_event_get : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::EventDef;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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_EventDef_event_get (const TAO_ClientRequestInfo_IR_EventDef_event_get &);
-- void operator= (const TAO_ClientRequestInfo_IR_EventDef_event_get &);
+@@ -24710,9 +20946,9 @@
+ 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
++ void result (IR_ValueDef_ptr result);
+ // update the result
- IR::ValueDef_ptr _result;
--};
--
--#endif /* TAO_HAS_INTERCEPTORS */
--
-+ virtual ~IR_EventDef (void);
-+private:
-+ IR_EventDef (const IR_EventDef &);
-+ void operator= (const IR_EventDef &);
++ IR_ValueDef_ptr _result;
};
-
-@@ -24757,13 +14935,13 @@
- // Base Impl. Declaration
+ #endif /* TAO_HAS_INTERCEPTORS */
+@@ -24730,7 +20966,7 @@
//
--class TAO_IFR_Client_Export _TAO_EventDef_Proxy_Impl :
+ class TAO_IFR_Client_Export _TAO_EventDef_Proxy_Impl :
- public virtual IR::_TAO_Contained_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_EventDef_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
-@@ -24772,7 +14950,7 @@
+@@ -24744,7 +20980,7 @@
CORBA::SystemException
)) = 0;
@@ -29419,7 +21604,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -24784,6 +14962,7 @@
+@@ -24756,6 +20992,7 @@
_TAO_EventDef_Proxy_Impl (void);
};
@@ -29427,32 +21612,16 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -24793,18 +14972,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_EventDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_EventDef_Remote_Proxy_Impl :
+@@ -24768,7 +21005,7 @@
+ class TAO_IFR_Client_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:
- _TAO_EventDef_Remote_Proxy_Impl (void);
--
-+
- 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
-@@ -24813,7 +14992,7 @@
+@@ -24785,7 +21022,7 @@
CORBA::SystemException
));
@@ -29461,24 +21630,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -24829,49 +15008,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_EventDef_Proxy_Broker
+@@ -24815,8 +21052,9 @@
{
public:
virtual ~_TAO_EventDef_Proxy_Broker (void);
@@ -29489,48 +21641,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_EventDef_Proxy_Broker (void);
--
-+
+@@ -24825,6 +21063,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_EventDef_Remote_Proxy_Broker : public virtual _TAO_EventDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_EventDef_Remote_Proxy_Broker (void);
--
-+
+@@ -24842,7 +21081,7 @@
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 ()
);
-@@ -24885,24 +15065,15 @@
+@@ -24856,24 +21095,15 @@
static _TAO_EventDef_Remote_Proxy_Broker *the_TAO_EventDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -29551,7 +21685,7 @@
#endif /* ! __GNUC__ || g++ >= 2.8 */
static void _tao_any_destructor (void*);
-@@ -24911,205 +15082,123 @@
+@@ -24882,159 +21112,85 @@
TAO_String_Manager id;
TAO_String_Manager defined_in;
TAO_String_Manager version;
@@ -29567,31 +21701,50 @@
- 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
--
-- // in, inout, out, _retn
++ 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;
--
--private:
++ 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_IFR_Client_Export EventDescription_out
--{
--public:
++class TAO_IFR_Client_Export IR_EventDescription_out
+ {
+ public:
- EventDescription_out (EventDescription *&);
- EventDescription_out (EventDescription_var &);
- EventDescription_out (const EventDescription_out &);
@@ -29600,10 +21753,19 @@
- operator EventDescription *&();
- EventDescription *&ptr (void);
- EventDescription *operator-> (void);
--
--private:
++ 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_;
-- // assignment from T_var not allowed
++ IR_EventDescription *&ptr_;
+ // assignment from T_var not allowed
- void operator= (const EventDescription_var &);
-};
-
@@ -29612,24 +21774,12 @@
-
-#if !defined (_IR_EMITSDEF___PTR_CH_)
-#define _IR_EMITSDEF___PTR_CH_
-+ 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
-
+-
-class EmitsDef;
-typedef EmitsDef *EmitsDef_ptr;
-+ IR_EventDescription_var &operator= (IR_EventDescription *);
-+ IR_EventDescription_var &operator= (const IR_EventDescription_var &);
-+ IR_EventDescription *operator-> (void);
-+ const IR_EventDescription *operator-> (void) const;
-
+-
-#endif /* end #if !defined */
-+ operator const IR_EventDescription &() const;
-+ operator IR_EventDescription &();
-+ operator IR_EventDescription &() const;
-+ operator IR_EventDescription *&(); // variable-size types only
-
+-
-
-#if !defined (_IR_EMITSDEF___VAR_CH_)
-#define _IR_EMITSDEF___VAR_CH_
@@ -29654,21 +21804,14 @@
- EmitsDef_ptr &out (void);
- EmitsDef_ptr _retn (void);
- EmitsDef_ptr ptr (void) const;
-+ // in, inout, out, _retn
-+ const IR_EventDescription &in (void) const;
-+ IR_EventDescription &inout (void);
-+ IR_EventDescription *&out (void);
-+ IR_EventDescription *_retn (void);
-+ IR_EventDescription *ptr (void) const;
-
- private:
+-
+-private:
- EmitsDef_ptr ptr_;
- // Unimplemented - prevents widening assignment.
- EmitsDef_var (const TAO_Base_var &rhs);
- EmitsDef_var &operator= (const TAO_Base_var &rhs);
-+ IR_EventDescription *ptr_;
- };
-
+-};
+-
-
-#endif /* end #if !defined */
-
@@ -29677,9 +21820,8 @@
-#define _IR_EMITSDEF___OUT_CH_
-
-class TAO_IFR_Client_Export EmitsDef_out
-+class TAO_IFR_Client_Export IR_EventDescription_out
- {
- public:
+-{
+-public:
- EmitsDef_out (EmitsDef_ptr &);
- EmitsDef_out (EmitsDef_var &);
- EmitsDef_out (const EmitsDef_out &);
@@ -29690,19 +21832,8 @@
- EmitsDef_ptr &ptr (void);
- EmitsDef_ptr 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:
+-private:
- EmitsDef_ptr &ptr_;
-+ IR_EventDescription *&ptr_;
-+ // assignment from T_var not allowed
+ void operator= (const IR_EventDescription_var &);
};
@@ -29736,15 +21867,13 @@
+ static IR_EmitsDef_ptr _duplicate (IR_EmitsDef_ptr obj);
+ static IR_EmitsDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static EmitsDef_ptr _nil (void)
@@ -29755,75 +21884,38 @@
}
static void _tao_any_destructor (void*);
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -25052,14 +21208,14 @@
_TAO_EmitsDef_Proxy_Broker *the_TAO_EmitsDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- EmitsDef (
-- TAO_Stub *objref,
+ 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 IR_EmitsDef_setup_collocation (int collocated);
+
+- EmitsDef (
+ IR_EmitsDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -25069,10 +21225,10 @@
+ friend class _TAO_EmitsDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_EmitsDef_Direct_Proxy_Impl;
+
- virtual ~EmitsDef (void);
--private:
++ virtual ~IR_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 */
-+ );
-
-+ 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 &);
- };
-
-@@ -25122,16 +15211,17 @@
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -25093,8 +21249,8 @@
// Base Impl. Declaration
//
@@ -29834,10 +21926,7 @@
{
public:
virtual ~_TAO_EmitsDef_Proxy_Impl (void) { }
--
-- protected:
-+
-+protected:
+@@ -25103,6 +21259,7 @@
_TAO_EmitsDef_Proxy_Impl (void);
};
@@ -29845,49 +21934,16 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -25141,18 +15231,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_EmitsDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_EmitsDef_Remote_Proxy_Impl :
+@@ -25115,7 +21272,7 @@
+ class TAO_IFR_Client_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:
- _TAO_EmitsDef_Remote_Proxy_Impl (void);
--
-+
- virtual ~_TAO_EmitsDef_Remote_Proxy_Impl (void) { }
--
-- };
-+
-+};
-
- //
- // Base Proxy Impl. Declaration
-@@ -25160,49 +15250,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_EmitsDef_Proxy_Broker
+@@ -25145,8 +21302,9 @@
{
public:
virtual ~_TAO_EmitsDef_Proxy_Broker (void);
@@ -29898,48 +21954,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_EmitsDef_Proxy_Broker (void);
--
-+
+@@ -25155,6 +21313,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_EmitsDef_Remote_Proxy_Broker : public virtual _TAO_EmitsDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_EmitsDef_Remote_Proxy_Broker (void);
--
-+
+@@ -25172,7 +21331,7 @@
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 ()
);
-@@ -25216,163 +15307,76 @@
+@@ -25186,117 +21345,38 @@
static _TAO_EmitsDef_Remote_Proxy_Broker *the_TAO_EmitsDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -30042,15 +22080,13 @@
+ static IR_PublishesDef_ptr _duplicate (IR_PublishesDef_ptr obj);
+ static IR_PublishesDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static PublishesDef_ptr _nil (void)
@@ -30061,75 +22097,38 @@
}
static void _tao_any_destructor (void*);
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -25314,14 +21394,14 @@
_TAO_PublishesDef_Proxy_Broker *the_TAO_PublishesDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- PublishesDef (
-- TAO_Stub *objref,
+ 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 IR_PublishesDef_setup_collocation (int collocated);
+
+- PublishesDef (
+ IR_PublishesDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -25331,10 +21411,10 @@
+ friend class _TAO_PublishesDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_PublishesDef_Direct_Proxy_Impl;
+
- virtual ~PublishesDef (void);
--private:
++ virtual ~IR_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 */
-+ );
-
-+ 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 &);
- };
-
-@@ -25385,16 +15389,17 @@
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -25355,8 +21435,8 @@
// Base Impl. Declaration
//
@@ -30140,10 +22139,7 @@
{
public:
virtual ~_TAO_PublishesDef_Proxy_Impl (void) { }
--
-- protected:
-+
-+protected:
+@@ -25365,6 +21445,7 @@
_TAO_PublishesDef_Proxy_Impl (void);
};
@@ -30151,49 +22147,16 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -25404,18 +15409,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_PublishesDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_PublishesDef_Remote_Proxy_Impl :
+@@ -25377,7 +21458,7 @@
+ class TAO_IFR_Client_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:
- _TAO_PublishesDef_Remote_Proxy_Impl (void);
--
-+
- virtual ~_TAO_PublishesDef_Remote_Proxy_Impl (void) { }
--
-- };
-+
-+};
-
- //
- // Base Proxy Impl. Declaration
-@@ -25423,143 +15428,66 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_PublishesDef_Proxy_Broker
+@@ -25407,8 +21488,9 @@
{
public:
virtual ~_TAO_PublishesDef_Proxy_Broker (void);
@@ -30204,51 +22167,32 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_PublishesDef_Proxy_Broker (void);
--
-+
+@@ -25417,6 +21499,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
+@@ -25434,7 +21517,7 @@
+ 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 ()
+ );
+@@ -25448,117 +21531,39 @@
+ static _TAO_PublishesDef_Remote_Proxy_Broker *the_TAO_PublishesDef_Remote_Proxy_Broker (void);
+ };
- ///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
+-
//
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
- class TAO_IFR_Client_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 (
-- 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
--///////////////////////////////////////////////////////////////////////
--
-
-#endif /* end #if !defined */
-
@@ -30269,7 +22213,7 @@
-
-class TAO_IFR_Client_Export ConsumesDef_var : public TAO_Base_var
-{
- public:
+-public:
- ConsumesDef_var (void); // default constructor
- ConsumesDef_var (ConsumesDef_ptr p) : ptr_ (p) {}
- ConsumesDef_var (const ConsumesDef_var &); // copy constructor
@@ -30295,27 +22239,16 @@
- ConsumesDef_var &operator= (const TAO_Base_var &rhs);
-};
-
-+ _TAO_PublishesDef_Remote_Proxy_Broker (void);
-
+-
-#endif /* end #if !defined */
-+ 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 ()
-+ );
-
+-
+-
-#if !defined (_IR_CONSUMESDEF___OUT_CH_)
-#define _IR_CONSUMESDEF___OUT_CH_
-+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.
-
+-
-class TAO_IFR_Client_Export ConsumesDef_out
-{
- public:
+-public:
- ConsumesDef_out (ConsumesDef_ptr &);
- ConsumesDef_out (ConsumesDef_var &);
- ConsumesDef_out (const ConsumesDef_out &);
@@ -30328,22 +22261,18 @@
-
-private:
- ConsumesDef_ptr &ptr_;
-+ static _TAO_PublishesDef_Remote_Proxy_Broker *the_TAO_PublishesDef_Remote_Proxy_Broker (void);
- };
-
+-};
+-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_CONSUMESDEF_CH_)
-#define _IR_CONSUMESDEF_CH_
-+//
-+// End Remote Proxy Broker Declaration
-+///////////////////////////////////////////////////////////////////////
-
+-
// Forward Classes Declaration
class _TAO_ConsumesDef_Proxy_Impl;
-@@ -25567,75 +15495,67 @@
+ class _TAO_ConsumesDef_Remote_Proxy_Impl;
class _TAO_ConsumesDef_Proxy_Broker;
class _TAO_ConsumesDef_Remote_Proxy_Broker;
@@ -30364,15 +22293,13 @@
+ static IR_ConsumesDef_ptr _duplicate (IR_ConsumesDef_ptr obj);
+ static IR_ConsumesDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static ConsumesDef_ptr _nil (void)
@@ -30383,75 +22310,38 @@
}
static void _tao_any_destructor (void*);
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -25576,14 +21581,14 @@
_TAO_ConsumesDef_Proxy_Broker *the_TAO_ConsumesDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- ConsumesDef (
-- TAO_Stub *objref,
+ 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 IR_ConsumesDef_setup_collocation (int collocated);
+
+- ConsumesDef (
+ IR_ConsumesDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -25593,10 +21598,10 @@
+ friend class _TAO_ConsumesDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ConsumesDef_Direct_Proxy_Impl;
+
- virtual ~ConsumesDef (void);
--private:
++ virtual ~IR_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 */
-+ );
-+
-+ 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 &);
- };
-
-@@ -25648,16 +15568,17 @@
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -25617,8 +21622,8 @@
// Base Impl. Declaration
//
@@ -30462,10 +22352,7 @@
{
public:
virtual ~_TAO_ConsumesDef_Proxy_Impl (void) { }
--
-- protected:
-+
-+protected:
+@@ -25627,6 +21632,7 @@
_TAO_ConsumesDef_Proxy_Impl (void);
};
@@ -30473,49 +22360,16 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -25667,18 +15588,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_ConsumesDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_ConsumesDef_Remote_Proxy_Impl :
+@@ -25639,7 +21645,7 @@
+ class TAO_IFR_Client_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:
- _TAO_ConsumesDef_Remote_Proxy_Impl (void);
--
-+
- virtual ~_TAO_ConsumesDef_Remote_Proxy_Impl (void) { }
--
-- };
-+
-+};
-
- //
- // Base Proxy Impl. Declaration
-@@ -25686,49 +15607,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ConsumesDef_Proxy_Broker
+@@ -25669,8 +21675,9 @@
{
public:
virtual ~_TAO_ConsumesDef_Proxy_Broker (void);
@@ -30526,50 +22380,47 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_ConsumesDef_Proxy_Broker (void);
--
-+
+@@ -25679,6 +21686,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
+@@ -25686,111 +21694,33 @@
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ConsumesDef_Remote_Proxy_Broker : public virtual _TAO_ConsumesDef_Proxy_Broker
- {
+ // Remote Proxy Broker Declaration
+-//
+-
+-class TAO_IFR_Client_Export _TAO_ConsumesDef_Remote_Proxy_Broker : public virtual _TAO_ConsumesDef_Proxy_Broker
+-{
-public:
-+public:
- _TAO_ConsumesDef_Remote_Proxy_Broker (void);
+- _TAO_ConsumesDef_Remote_Proxy_Broker (void);
-
-+
- virtual ~_TAO_ConsumesDef_Remote_Proxy_Broker (void);
+- virtual ~_TAO_ConsumesDef_Remote_Proxy_Broker (void);
-
-+
- virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
+- virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
- ConsumesDef *object,
-+ IR_ConsumesDef *object,
- CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
- );
-
-@@ -25742,123 +15664,45 @@
- static _TAO_ConsumesDef_Remote_Proxy_Broker *the_TAO_ConsumesDef_Remote_Proxy_Broker (void);
- };
-
+- 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
-+// End Remote Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
+-///////////////////////////////////////////////////////////////////////
+-
-
-#endif /* end #if !defined */
-
@@ -30622,10 +22473,12 @@
-
-#if !defined (_IR_COMPONENTDEF___OUT_CH_)
-#define _IR_COMPONENTDEF___OUT_CH_
--
++//
+
-class TAO_IFR_Client_Export ComponentDef_out
--{
--public:
++class TAO_IFR_Client_Export _TAO_ConsumesDef_Remote_Proxy_Broker : public virtual _TAO_ConsumesDef_Proxy_Broker
+ {
+ public:
- ComponentDef_out (ComponentDef_ptr &);
- ComponentDef_out (ComponentDef_var &);
- ComponentDef_out (const ComponentDef_out &);
@@ -30635,21 +22488,38 @@
- operator ComponentDef_ptr &();
- ComponentDef_ptr &ptr (void);
- ComponentDef_ptr operator-> (void);
--
++ _TAO_ConsumesDef_Remote_Proxy_Broker (void);
+
-private:
- ComponentDef_ptr &ptr_;
-};
--
--
++ 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 ()
++ );
+
-#endif /* end #if !defined */
--
--
++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);
++};
+
-#if !defined (_IR_COMPONENTDEF_CH_)
-#define _IR_COMPONENTDEF_CH_
--
++//
++// End Remote Proxy Broker Declaration
++///////////////////////////////////////////////////////////////////////
+
// Forward Classes Declaration
class _TAO_ComponentDef_Proxy_Impl;
- class _TAO_ComponentDef_Remote_Proxy_Impl;
+@@ -25798,34 +21728,34 @@
class _TAO_ComponentDef_Proxy_Broker;
class _TAO_ComponentDef_Remote_Proxy_Broker;
@@ -30670,15 +22540,13 @@
+ static IR_ComponentDef_ptr _duplicate (IR_ComponentDef_ptr obj);
+ static IR_ComponentDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static ComponentDef_ptr _nil (void)
@@ -30691,932 +22559,518 @@
static void _tao_any_destructor (void*);
- virtual IR::InterfaceDefSeq * supported_interfaces (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_InterfaceDefSeq * supported_interfaces (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -25866,56 +15710,56 @@
+@@ -25834,7 +21764,7 @@
));
virtual void supported_interfaces (
- const IR::InterfaceDefSeq & supported_interfaces,
-- CORBA::Environment &ACE_TRY_ENV =
+ const IR_InterfaceDefSeq & supported_interfaces,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -25842,7 +21772,7 @@
CORBA::SystemException
));
- virtual IR::ComponentDef_ptr base_component (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_ComponentDef_ptr base_component (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -25850,7 +21780,7 @@
CORBA::SystemException
));
- virtual IR::ProvidesDefSeq * provides_interfaces (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_ProvidesDefSeq * provides_interfaces (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -25858,7 +21788,7 @@
CORBA::SystemException
));
- virtual IR::UsesDefSeq * uses_interfaces (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_UsesDefSeq * uses_interfaces (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -25866,7 +21796,7 @@
CORBA::SystemException
));
- virtual IR::EmitsDefSeq * emits_events (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_EmitsDefSeq * emits_events (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -25874,7 +21804,7 @@
CORBA::SystemException
));
- virtual IR::PublishesDefSeq * publishes_events (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_PublishesDefSeq * publishes_events (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -25882,7 +21812,7 @@
CORBA::SystemException
));
- virtual IR::ConsumesDefSeq * consumes_events (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_ConsumesDefSeq * consumes_events (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -25923,749 +15767,110 @@
+@@ -25898,11 +21828,11 @@
+ CORBA::SystemException
));
- virtual CORBA::Boolean is_basic (
-- 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,
++ 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
-- ));
--
++ IR_InterfaceDef_ptr interface_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25910,11 +21840,11 @@
+ CORBA::SystemException
+ ));
+
- virtual IR::UsesDef_ptr create_uses (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
--
++ IR_InterfaceDef_ptr interface_type,
+ CORBA::Boolean is_multiple,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -25923,11 +21853,11 @@
+ CORBA::SystemException
+ ));
+
- virtual IR::EmitsDef_ptr create_emits (
-- const char * id,
-- const char * name,
-- const char * version,
++ 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
-- ));
--
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25935,11 +21865,11 @@
+ CORBA::SystemException
+ ));
+
- virtual IR::PublishesDef_ptr create_publishes (
-- const char * id,
-- const char * name,
-- const char * version,
++ virtual IR_PublishesDef_ptr create_publishes (
+ const char * id,
+ const char * name,
+ const char * version,
- IR::ValueDef_ptr value,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -25947,11 +21877,11 @@
CORBA::SystemException
));
- virtual IR::ConsumesDef_ptr create_consumes (
-+ virtual IR_ProvidesDef_ptr create_provides (
++ virtual IR_ConsumesDef_ptr create_consumes (
const char * id,
-- const char * name,
-- const char * version,
+ 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:
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25972,14 +21902,14 @@
+ _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);
--
++ 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 IR_ComponentDef_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;
--
++ IR_ComponentDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+@@ -25989,10 +21919,10 @@
+ friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ComponentDef_Direct_Proxy_Impl;
+
- virtual ~ComponentDef (void);
--private:
++ virtual ~IR_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:
++ IR_ComponentDef (const IR_ComponentDef &);
++ void operator= (const IR_ComponentDef &);
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -26002,7 +21932,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_ComponentDef;
+
+ friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+ friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+@@ -26036,15 +21966,15 @@
+ 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
++ void result (IR_InterfaceDefSeq * result);
+ // update the result
- IR::InterfaceDefSeq * _result;
--};
--
--class TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
++ friend class IR_ComponentDef;
+
+ friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+ friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+@@ -26053,7 +21983,7 @@
+ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (
+ TAO_GIOP_Invocation *_tao_invocation,
+ CORBA::Object_ptr _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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -26079,14 +22009,14 @@
+ 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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_ComponentDef;
+
+ friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+ friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+@@ -26120,15 +22050,15 @@
+ 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
++ 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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_ComponentDef;
+
+ friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+ friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+@@ -26162,15 +22092,15 @@
+ 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
++ void result (IR_ProvidesDefSeq * result);
+ // update the result
- IR::ProvidesDefSeq * _result;
--};
--
--class TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_ComponentDef;
+
+ friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+ friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+@@ -26204,15 +22134,15 @@
+ 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
++ void result (IR_UsesDefSeq * result);
+ // update the result
- IR::UsesDefSeq * _result;
--};
--
--class TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_ComponentDef;
+
+ friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+ friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+@@ -26246,15 +22176,15 @@
+ 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
++ void result (IR_EmitsDefSeq * result);
+ // update the result
- IR::EmitsDefSeq * _result;
--};
--
--class TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_ComponentDef;
+
+ friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+ friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+@@ -26288,15 +22218,15 @@
+ 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
++ void result (IR_PublishesDefSeq * result);
+ // update the result
- IR::PublishesDefSeq * _result;
--};
--
--class TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_ComponentDef;
+
+ friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+ friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+@@ -26330,15 +22260,15 @@
+ 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
++ void result (IR_ConsumesDefSeq * result);
+ // update the result
- IR::ConsumesDefSeq * _result;
--};
--
--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;
--
--TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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));
-+ 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
-+ ));
++ IR_ConsumesDefSeq * _result;
+ };
--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:
+ 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_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++ friend class IR_ComponentDef;
+
+ friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+ friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+@@ -26380,7 +22310,7 @@
+ class TAO_ClientRequestInfo_IR_ComponentDef_create_provides : public TAO_ClientRequestInfo
+ {
+ public:
+- friend class IR::ComponentDef;
++ friend class IR_ComponentDef;
+
+ friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+ friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+@@ -26392,7 +22322,7 @@
+ 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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -26421,16 +22351,16 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
- IR::InterfaceDef_ptr interface_type_;
- void result (IR::ProvidesDef_ptr result);
-- // update the result
++ 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:
++ IR_ProvidesDef_ptr _result;
+ };
+
+ class TAO_ClientRequestInfo_IR_ComponentDef_create_uses : 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 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);
-
--TAO_ClientRequestInfo_IR_ComponentDef_create_uses (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++ friend class IR_ComponentDef;
+
+ friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+ friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+@@ -26442,7 +22372,7 @@
+ 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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -26472,17 +22402,17 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
- IR::InterfaceDef_ptr interface_type_;
-- const CORBA::Boolean & is_multiple_;
++ IR_InterfaceDef_ptr interface_type_;
+ const CORBA::Boolean & is_multiple_;
- void result (IR::UsesDef_ptr result);
-- // update the result
++ void result (IR_UsesDef_ptr result);
+ // update the result
- IR::UsesDef_ptr _result;
--};
-+ virtual const char* _interface_repository_id (void) const;
++ IR_UsesDef_ptr _result;
+ };
--class TAO_ClientRequestInfo_IR_ComponentDef_create_emits : public TAO_ClientRequestInfo
--{
--public:
+ class TAO_ClientRequestInfo_IR_ComponentDef_create_emits : 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;
-+private:
-+ _TAO_ComponentDef_Proxy_Broker *the_TAO_ComponentDef_Proxy_Broker_;
-
--TAO_ClientRequestInfo_IR_ComponentDef_create_emits (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++ friend class IR_ComponentDef;
+
+ friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+ friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+@@ -26494,7 +22424,7 @@
+ 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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -26523,16 +22453,16 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
- IR::ValueDef_ptr value_;
- void result (IR::EmitsDef_ptr result);
-- // update the result
++ IR_ValueDef_ptr value_;
++ void result (IR_EmitsDef_ptr result);
+ // update the result
- IR::EmitsDef_ptr _result;
--};
-+protected:
-+ IR_ComponentDef (int collocated = 0);
++ IR_EmitsDef_ptr _result;
+ };
--class TAO_ClientRequestInfo_IR_ComponentDef_create_publishes : public TAO_ClientRequestInfo
--{
--public:
+ class TAO_ClientRequestInfo_IR_ComponentDef_create_publishes : 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;
-+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);
-
--TAO_ClientRequestInfo_IR_ComponentDef_create_publishes (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++ friend class IR_ComponentDef;
+
+ friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+ friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+@@ -26544,7 +22474,7 @@
+ 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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -26573,16 +22503,16 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
- IR::ValueDef_ptr value_;
- void result (IR::PublishesDef_ptr result);
-- // update the result
++ IR_ValueDef_ptr value_;
++ void result (IR_PublishesDef_ptr result);
+ // update the result
- IR::PublishesDef_ptr _result;
--};
-+ IR_ComponentDef (
-+ TAO_Stub *objref,
-+ CORBA::Boolean _tao_collocated = 0,
-+ TAO_Abstract_ServantBase *servant = 0
-+ );
++ IR_PublishesDef_ptr _result;
+ };
--class TAO_ClientRequestInfo_IR_ComponentDef_create_consumes : public TAO_ClientRequestInfo
--{
--public:
+ class TAO_ClientRequestInfo_IR_ComponentDef_create_consumes : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::ComponentDef;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
+@@ -26594,7 +22524,7 @@
+ 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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -26623,17 +22553,16 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
- IR::ValueDef_ptr value_;
- void result (IR::ConsumesDef_ptr result);
-- // update the result
++ 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 &);
++ IR_ConsumesDef_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.
-@@ -26675,13 +15880,13 @@
- // Base Impl. Declaration
+@@ -26644,12 +22573,12 @@
//
--class TAO_IFR_Client_Export _TAO_ComponentDef_Proxy_Impl :
+ class TAO_IFR_Client_Export _TAO_ComponentDef_Proxy_Impl :
- public virtual IR::_TAO_InterfaceDef_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_ComponentDef_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
)
-@@ -26691,14 +15896,14 @@
+@@ -26659,14 +22588,14 @@
virtual void supported_interfaces (
CORBA_Object *_collocated_tao_target_,
@@ -31633,7 +23087,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -26706,7 +15911,7 @@
+@@ -26674,7 +22603,7 @@
CORBA::SystemException
)) = 0;
@@ -31642,7 +23096,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -26714,7 +15919,7 @@
+@@ -26682,7 +22611,7 @@
CORBA::SystemException
)) = 0;
@@ -31651,7 +23105,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -26722,7 +15927,7 @@
+@@ -26690,7 +22619,7 @@
CORBA::SystemException
)) = 0;
@@ -31660,7 +23114,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -26730,7 +15935,7 @@
+@@ -26698,7 +22627,7 @@
CORBA::SystemException
)) = 0;
@@ -31669,7 +23123,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -26738,7 +15943,7 @@
+@@ -26706,7 +22635,7 @@
CORBA::SystemException
)) = 0;
@@ -31678,7 +23132,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -26754,24 +15959,24 @@
+@@ -26722,24 +22651,24 @@
CORBA::SystemException
)) = 0;
@@ -31707,7 +23161,7 @@
CORBA::Boolean is_multiple,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -26779,36 +15984,36 @@
+@@ -26747,36 +22676,36 @@
CORBA::SystemException
)) = 0;
@@ -31750,7 +23204,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -26819,6 +16024,7 @@
+@@ -26787,6 +22716,7 @@
_TAO_ComponentDef_Proxy_Impl (void);
};
@@ -31758,32 +23212,25 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -26828,18 +16034,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_ComponentDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_ComponentDef_Remote_Proxy_Impl :
+@@ -26799,7 +22729,7 @@
+ class TAO_IFR_Client_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:
- _TAO_ComponentDef_Remote_Proxy_Impl (void);
--
-+
+@@ -26807,7 +22737,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
)
-@@ -26849,14 +16055,14 @@
+@@ -26817,14 +22747,14 @@
virtual void supported_interfaces (
CORBA_Object *_collocated_tao_target_,
@@ -31800,7 +23247,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -26864,7 +16070,7 @@
+@@ -26832,7 +22762,7 @@
CORBA::SystemException
));
@@ -31809,7 +23256,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -26872,7 +16078,7 @@
+@@ -26840,7 +22770,7 @@
CORBA::SystemException
));
@@ -31818,7 +23265,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -26880,7 +16086,7 @@
+@@ -26848,7 +22778,7 @@
CORBA::SystemException
));
@@ -31827,7 +23274,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -26888,7 +16094,7 @@
+@@ -26856,7 +22786,7 @@
CORBA::SystemException
));
@@ -31836,7 +23283,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -26896,7 +16102,7 @@
+@@ -26864,7 +22794,7 @@
CORBA::SystemException
));
@@ -31845,7 +23292,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -26912,24 +16118,24 @@
+@@ -26880,24 +22810,24 @@
CORBA::SystemException
));
@@ -31874,7 +23321,7 @@
CORBA::Boolean is_multiple,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -26937,36 +16143,36 @@
+@@ -26905,36 +22835,36 @@
CORBA::SystemException
));
@@ -31917,24 +23364,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -26981,49 +16187,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ComponentDef_Proxy_Broker
+@@ -26963,8 +22893,9 @@
{
public:
virtual ~_TAO_ComponentDef_Proxy_Broker (void);
@@ -31945,48 +23375,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_ComponentDef_Proxy_Broker (void);
--
-+
+@@ -26973,6 +22904,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_ComponentDef_Remote_Proxy_Broker : public virtual _TAO_ComponentDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_ComponentDef_Remote_Proxy_Broker (void);
--
-+
+@@ -26990,7 +22922,7 @@
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 ()
);
-@@ -27037,24 +16244,15 @@
+@@ -27004,24 +22936,15 @@
static _TAO_ComponentDef_Remote_Proxy_Broker *the_TAO_ComponentDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -32007,7 +23419,7 @@
#endif /* ! __GNUC__ || g++ >= 2.8 */
static void _tao_any_destructor (void*);
-@@ -27064,181 +16262,107 @@
+@@ -27031,166 +22954,92 @@
TAO_String_Manager defined_in;
TAO_String_Manager version;
TAO_String_Manager base_component;
@@ -32036,31 +23448,50 @@
- ComponentDescription_var (ComponentDescription *);
- ComponentDescription_var (const ComponentDescription_var &); // copy constructor
- ~ComponentDescription_var (void); // destructor
--
++ 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
+
- ComponentDescription_var &operator= (ComponentDescription *);
- ComponentDescription_var &operator= (const ComponentDescription_var &);
- ComponentDescription *operator-> (void);
- const ComponentDescription *operator-> (void) const;
--
++ 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 ComponentDescription &() const;
- operator ComponentDescription &();
- operator ComponentDescription &() const;
- operator ComponentDescription *&(); // variable-size types only
--
-- // in, inout, out, _retn
++ operator const IR_ComponentDescription &() const;
++ operator IR_ComponentDescription &();
++ operator IR_ComponentDescription &() const;
++ operator IR_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:
++ const IR_ComponentDescription &in (void) const;
++ IR_ComponentDescription &inout (void);
++ IR_ComponentDescription *&out (void);
++ IR_ComponentDescription *_retn (void);
++ IR_ComponentDescription *ptr (void) const;
+
+ private:
- ComponentDescription *ptr_;
--};
--
++ IR_ComponentDescription *ptr_;
+ };
+
-class TAO_IFR_Client_Export ComponentDescription_out
--{
--public:
++class TAO_IFR_Client_Export IR_ComponentDescription_out
+ {
+ public:
- ComponentDescription_out (ComponentDescription *&);
- ComponentDescription_out (ComponentDescription_var &);
- ComponentDescription_out (const ComponentDescription_out &);
@@ -32069,31 +23500,28 @@
- operator ComponentDescription *&();
- ComponentDescription *&ptr (void);
- ComponentDescription *operator-> (void);
--
--private:
++ 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:
- ComponentDescription *&ptr_;
-- // assignment from T_var not allowed
++ IR_ComponentDescription *&ptr_;
+ // assignment from T_var not allowed
- void operator= (const ComponentDescription_var &);
-};
-
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentDescription;
-+ 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
-
-+ IR_ComponentDescription_var &operator= (IR_ComponentDescription *);
-+ IR_ComponentDescription_var &operator= (const IR_ComponentDescription_var &);
-+ IR_ComponentDescription *operator-> (void);
-+ const IR_ComponentDescription *operator-> (void) const;
-
+-
+-
-#if !defined (_IR_PRIMARYKEYDEF___PTR_CH_)
-#define _IR_PRIMARYKEYDEF___PTR_CH_
-+ operator const IR_ComponentDescription &() const;
-+ operator IR_ComponentDescription &();
-+ operator IR_ComponentDescription &() const;
-+ operator IR_ComponentDescription *&(); // variable-size types only
-
+-
-class PrimaryKeyDef;
-typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
-
@@ -32123,21 +23551,14 @@
- PrimaryKeyDef_ptr &out (void);
- PrimaryKeyDef_ptr _retn (void);
- PrimaryKeyDef_ptr ptr (void) const;
-+ // in, inout, out, _retn
-+ const IR_ComponentDescription &in (void) const;
-+ IR_ComponentDescription &inout (void);
-+ IR_ComponentDescription *&out (void);
-+ IR_ComponentDescription *_retn (void);
-+ IR_ComponentDescription *ptr (void) const;
-
- private:
+-
+-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 */
-
@@ -32146,9 +23567,8 @@
-#define _IR_PRIMARYKEYDEF___OUT_CH_
-
-class TAO_IFR_Client_Export PrimaryKeyDef_out
-+class TAO_IFR_Client_Export IR_ComponentDescription_out
- {
- public:
+-{
+-public:
- PrimaryKeyDef_out (PrimaryKeyDef_ptr &);
- PrimaryKeyDef_out (PrimaryKeyDef_var &);
- PrimaryKeyDef_out (const PrimaryKeyDef_out &);
@@ -32159,19 +23579,8 @@
- 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:
+-private:
- PrimaryKeyDef_ptr &ptr_;
-+ IR_ComponentDescription *&ptr_;
-+ // assignment from T_var not allowed
+ void operator= (const IR_ComponentDescription_var &);
};
@@ -32205,15 +23614,13 @@
+ static IR_PrimaryKeyDef_ptr _duplicate (IR_PrimaryKeyDef_ptr obj);
+ static IR_PrimaryKeyDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static PrimaryKeyDef_ptr _unchecked_narrow (
+ static IR_PrimaryKeyDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static PrimaryKeyDef_ptr _nil (void)
@@ -32224,196 +23631,86 @@
}
static void _tao_any_destructor (void*);
-
- 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 ((
+@@ -27204,7 +23053,7 @@
CORBA::SystemException
));
- virtual IR::ValueDef_ptr primary_key (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_ValueDef_ptr primary_key (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -27246,133 +16370,39 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -27225,14 +23074,14 @@
_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,
+ 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);
-+
+
+ protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void IR_PrimaryKeyDef_setup_collocation (int collocated);
+
+- PrimaryKeyDef (
+ IR_PrimaryKeyDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -27242,10 +23091,10 @@
+ friend class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_PrimaryKeyDef_Direct_Proxy_Impl;
+
- virtual ~PrimaryKeyDef (void);
--private:
++ virtual ~IR_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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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;
--};
++ IR_PrimaryKeyDef (const IR_PrimaryKeyDef &);
++ void operator= (const IR_PrimaryKeyDef &);
--class TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get : public TAO_ClientRequestInfo
--{
--public:
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -27255,7 +23104,7 @@
+ class TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a : public TAO_ClientRequestInfo
+ {
+ public:
+- friend class IR::PrimaryKeyDef;
++ friend class IR_PrimaryKeyDef;
+
+ friend class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
+ friend class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
+@@ -27299,7 +23148,7 @@
+ class TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::PrimaryKeyDef;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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_PrimaryKeyDef_primary_key_get (const TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get &);
-- void operator= (const TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get &);
+ friend class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
+@@ -27333,9 +23182,9 @@
+ 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
++ void result (IR_ValueDef_ptr result);
+ // update the result
- IR::ValueDef_ptr _result;
--};
--
--#endif /* TAO_HAS_INTERCEPTORS */
-+ 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 &);
++ IR_ValueDef_ptr _result;
};
-
-@@ -27385,13 +16415,13 @@
- // Base Impl. Declaration
+ #endif /* TAO_HAS_INTERCEPTORS */
+@@ -27353,7 +23202,7 @@
//
--class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Proxy_Impl :
+ class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Proxy_Impl :
- public virtual IR::_TAO_Contained_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_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
-@@ -27400,7 +16430,7 @@
+@@ -27367,7 +23216,7 @@
CORBA::SystemException
)) = 0;
@@ -32422,7 +23719,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -27412,6 +16442,7 @@
+@@ -27379,6 +23228,7 @@
_TAO_PrimaryKeyDef_Proxy_Impl (void);
};
@@ -32430,32 +23727,16 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -27421,18 +16452,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Remote_Proxy_Impl :
+@@ -27391,7 +23241,7 @@
+ class TAO_IFR_Client_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:
- _TAO_PrimaryKeyDef_Remote_Proxy_Impl (void);
--
-+
- 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
-@@ -27441,7 +16472,7 @@
+@@ -27408,7 +23258,7 @@
CORBA::SystemException
));
@@ -32464,24 +23745,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -27457,49 +16488,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Proxy_Broker
+@@ -27438,8 +23288,9 @@
{
public:
virtual ~_TAO_PrimaryKeyDef_Proxy_Broker (void);
@@ -32492,48 +23756,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_PrimaryKeyDef_Proxy_Broker (void);
--
-+
+@@ -27448,6 +23299,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Remote_Proxy_Broker : public virtual _TAO_PrimaryKeyDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
--
-+
+@@ -27465,7 +23317,7 @@
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 ()
);
-@@ -27513,24 +16545,15 @@
+@@ -27479,24 +23331,15 @@
static _TAO_PrimaryKeyDef_Remote_Proxy_Broker *the_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -32554,7 +23800,7 @@
#endif /* ! __GNUC__ || g++ >= 2.8 */
static void _tao_any_destructor (void*);
-@@ -27539,205 +16562,123 @@
+@@ -27505,159 +23348,85 @@
TAO_String_Manager id;
TAO_String_Manager defined_in;
TAO_String_Manager version;
@@ -32570,31 +23816,50 @@
- 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
--
-- // in, inout, out, _retn
++ 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;
--
--private:
++ 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_IFR_Client_Export PrimaryKeyDescription_out
--{
--public:
++class TAO_IFR_Client_Export IR_PrimaryKeyDescription_out
+ {
+ public:
- PrimaryKeyDescription_out (PrimaryKeyDescription *&);
- PrimaryKeyDescription_out (PrimaryKeyDescription_var &);
- PrimaryKeyDescription_out (const PrimaryKeyDescription_out &);
@@ -32603,10 +23868,19 @@
- operator PrimaryKeyDescription *&();
- PrimaryKeyDescription *&ptr (void);
- PrimaryKeyDescription *operator-> (void);
--
--private:
++ 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_;
-- // assignment from T_var not allowed
++ IR_PrimaryKeyDescription *&ptr_;
+ // assignment from T_var not allowed
- void operator= (const PrimaryKeyDescription_var &);
-};
-
@@ -32615,24 +23889,12 @@
-
-#if !defined (_IR_FACTORYDEF___PTR_CH_)
-#define _IR_FACTORYDEF___PTR_CH_
-+ 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
-
+-
-class FactoryDef;
-typedef FactoryDef *FactoryDef_ptr;
-+ IR_PrimaryKeyDescription_var &operator= (IR_PrimaryKeyDescription *);
-+ IR_PrimaryKeyDescription_var &operator= (const IR_PrimaryKeyDescription_var &);
-+ IR_PrimaryKeyDescription *operator-> (void);
-+ const IR_PrimaryKeyDescription *operator-> (void) const;
-
+-
-#endif /* end #if !defined */
-+ operator const IR_PrimaryKeyDescription &() const;
-+ operator IR_PrimaryKeyDescription &();
-+ operator IR_PrimaryKeyDescription &() const;
-+ operator IR_PrimaryKeyDescription *&(); // variable-size types only
-
+-
-
-#if !defined (_IR_FACTORYDEF___VAR_CH_)
-#define _IR_FACTORYDEF___VAR_CH_
@@ -32657,21 +23919,14 @@
- FactoryDef_ptr &out (void);
- FactoryDef_ptr _retn (void);
- FactoryDef_ptr ptr (void) const;
-+ // in, inout, out, _retn
-+ const IR_PrimaryKeyDescription &in (void) const;
-+ IR_PrimaryKeyDescription &inout (void);
-+ IR_PrimaryKeyDescription *&out (void);
-+ IR_PrimaryKeyDescription *_retn (void);
-+ IR_PrimaryKeyDescription *ptr (void) const;
-
- private:
+-
+-private:
- FactoryDef_ptr ptr_;
- // Unimplemented - prevents widening assignment.
- FactoryDef_var (const TAO_Base_var &rhs);
- FactoryDef_var &operator= (const TAO_Base_var &rhs);
-+ IR_PrimaryKeyDescription *ptr_;
- };
-
+-};
+-
-
-#endif /* end #if !defined */
-
@@ -32680,9 +23935,8 @@
-#define _IR_FACTORYDEF___OUT_CH_
-
-class TAO_IFR_Client_Export FactoryDef_out
-+class TAO_IFR_Client_Export IR_PrimaryKeyDescription_out
- {
- public:
+-{
+-public:
- FactoryDef_out (FactoryDef_ptr &);
- FactoryDef_out (FactoryDef_var &);
- FactoryDef_out (const FactoryDef_out &);
@@ -32693,19 +23947,8 @@
- FactoryDef_ptr &ptr (void);
- FactoryDef_ptr 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:
+-private:
- FactoryDef_ptr &ptr_;
-+ IR_PrimaryKeyDescription *&ptr_;
-+ // assignment from T_var not allowed
+ void operator= (const IR_PrimaryKeyDescription_var &);
};
@@ -32739,15 +23982,13 @@
+ static IR_FactoryDef_ptr _duplicate (IR_FactoryDef_ptr obj);
+ static IR_FactoryDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static FactoryDef_ptr _nil (void)
@@ -32758,75 +23999,38 @@
}
static void _tao_any_destructor (void*);
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -27675,14 +23444,14 @@
_TAO_FactoryDef_Proxy_Broker *the_TAO_FactoryDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- FactoryDef (
-- TAO_Stub *objref,
+ 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 IR_FactoryDef_setup_collocation (int collocated);
+
+- FactoryDef (
+ IR_FactoryDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -27692,10 +23461,10 @@
+ friend class _TAO_FactoryDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_FactoryDef_Direct_Proxy_Impl;
+
- virtual ~FactoryDef (void);
--private:
++ virtual ~IR_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 */
-+ );
-
-+ 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 &);
- };
-
-@@ -27750,16 +16691,17 @@
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -27716,8 +23485,8 @@
// Base Impl. Declaration
//
@@ -32837,10 +24041,7 @@
{
public:
virtual ~_TAO_FactoryDef_Proxy_Impl (void) { }
--
-- protected:
-+
-+protected:
+@@ -27726,6 +23495,7 @@
_TAO_FactoryDef_Proxy_Impl (void);
};
@@ -32848,49 +24049,16 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -27769,18 +16711,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_FactoryDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_FactoryDef_Remote_Proxy_Impl :
+@@ -27738,7 +23508,7 @@
+ class TAO_IFR_Client_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:
- _TAO_FactoryDef_Remote_Proxy_Impl (void);
--
-+
- virtual ~_TAO_FactoryDef_Remote_Proxy_Impl (void) { }
--
-- };
-+
-+};
-
- //
- // Base Proxy Impl. Declaration
-@@ -27788,49 +16730,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_FactoryDef_Proxy_Broker
+@@ -27768,8 +23538,9 @@
{
public:
virtual ~_TAO_FactoryDef_Proxy_Broker (void);
@@ -32901,48 +24069,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_FactoryDef_Proxy_Broker (void);
--
-+
+@@ -27778,6 +23549,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_FactoryDef_Remote_Proxy_Broker : public virtual _TAO_FactoryDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_FactoryDef_Remote_Proxy_Broker (void);
--
-+
+@@ -27795,7 +23567,7 @@
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 ()
);
-@@ -27844,163 +16787,77 @@
+@@ -27809,117 +23581,39 @@
static _TAO_FactoryDef_Remote_Proxy_Broker *the_TAO_FactoryDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -33045,15 +24195,13 @@
+ static IR_FinderDef_ptr _duplicate (IR_FinderDef_ptr obj);
+ static IR_FinderDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static FinderDef_ptr _nil (void)
@@ -33064,75 +24212,38 @@
}
static void _tao_any_destructor (void*);
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -27937,14 +23631,14 @@
_TAO_FinderDef_Proxy_Broker *the_TAO_FinderDef_Proxy_Broker_;
--
-+
+
protected:
- 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 (
-- TAO_Stub *objref,
+ 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);
-+
+
+ protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void IR_FinderDef_setup_collocation (int collocated);
+
+- FinderDef (
+ IR_FinderDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -27954,10 +23648,10 @@
+ friend class _TAO_FinderDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_FinderDef_Direct_Proxy_Impl;
+
- virtual ~FinderDef (void);
--private:
++ virtual ~IR_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 */
-+ );
-+
-+ 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 &);
- };
-
-@@ -28013,16 +16870,17 @@
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -27978,8 +23672,8 @@
// Base Impl. Declaration
//
@@ -33143,10 +24254,7 @@
{
public:
virtual ~_TAO_FinderDef_Proxy_Impl (void) { }
--
-- protected:
-+
-+protected:
+@@ -27988,6 +23682,7 @@
_TAO_FinderDef_Proxy_Impl (void);
};
@@ -33154,49 +24262,16 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -28032,18 +16890,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_FinderDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_FinderDef_Remote_Proxy_Impl :
+@@ -28000,7 +23695,7 @@
+ class TAO_IFR_Client_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:
- _TAO_FinderDef_Remote_Proxy_Impl (void);
--
-+
- virtual ~_TAO_FinderDef_Remote_Proxy_Impl (void) { }
--
-- };
-+
-+};
-
- //
- // Base Proxy Impl. Declaration
-@@ -28051,49 +16909,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_FinderDef_Proxy_Broker
+@@ -28030,8 +23725,9 @@
{
public:
virtual ~_TAO_FinderDef_Proxy_Broker (void);
@@ -33207,48 +24282,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_FinderDef_Proxy_Broker (void);
--
-+
+@@ -28040,6 +23736,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
-
-
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_FinderDef_Remote_Proxy_Broker : public virtual _TAO_FinderDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_FinderDef_Remote_Proxy_Broker (void);
--
-+
+@@ -28057,7 +23754,7 @@
virtual ~_TAO_FinderDef_Remote_Proxy_Broker (void);
--
-+
+
virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
- FinderDef *object,
+ IR_FinderDef *object,
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
);
-@@ -28107,155 +16966,77 @@
+@@ -28071,122 +23768,44 @@
static _TAO_FinderDef_Remote_Proxy_Broker *the_TAO_FinderDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -33351,15 +24408,13 @@
+ static IR_HomeDef_ptr _duplicate (IR_HomeDef_ptr obj);
+ static IR_HomeDef_ptr _narrow (
CORBA::Object_ptr obj,
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ 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 =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
- static HomeDef_ptr _nil (void)
@@ -33372,61 +24427,47 @@
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 =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -28194,7 +23813,7 @@
CORBA::SystemException
));
- virtual IR::ComponentDef_ptr managed_component (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_ComponentDef_ptr managed_component (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -28202,7 +23821,7 @@
CORBA::SystemException
));
- virtual IR::PrimaryKeyDef_ptr primary_key (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_PrimaryKeyDef_ptr primary_key (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -28210,7 +23829,7 @@
CORBA::SystemException
));
- virtual IR::FactoryDefSeq * factories (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_FactoryDefSeq * factories (
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -28218,7 +23837,7 @@
CORBA::SystemException
));
- virtual IR::FinderDefSeq * finders (
-- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_FinderDefSeq * finders (
-+ CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
-@@ -28263,45 +17044,45 @@
- ));
-
- virtual CORBA::Boolean is_basic (
-- CORBA::Environment &ACE_TRY_ENV =
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -28234,11 +23853,11 @@
CORBA::SystemException
));
@@ -33436,12 +24477,11 @@
const char * name,
const char * version,
- IR::ValueDef_ptr primary_key,
-- CORBA::Environment &ACE_TRY_ENV =
+ IR_ValueDef_ptr primary_key,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -28246,12 +23865,12 @@
CORBA::SystemException
));
@@ -33452,13 +24492,12 @@
const char * version,
- const IR::ParDescriptionSeq & params,
- const IR::ExceptionDefSeq & exceptions,
-- CORBA::Environment &ACE_TRY_ENV =
+ const IR_ParDescriptionSeq & params,
+ const IR_ExceptionDefSeq & exceptions,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
+@@ -28259,12 +23878,12 @@
CORBA::SystemException
));
@@ -33469,502 +24508,262 @@
const char * version,
- const IR::ParDescriptionSeq & params,
- const IR::ExceptionDefSeq & exceptions,
-- CORBA::Environment &ACE_TRY_ENV =
+ const IR_ParDescriptionSeq & params,
+ const IR_ExceptionDefSeq & exceptions,
-+ CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
- ACE_THROW_SPEC ((
-@@ -28309,453 +17090,39 @@
- ));
-
- virtual CORBA::Boolean _is_a (
-- const CORBA::Char *type_id,
-- CORBA::Environment &ACE_TRY_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:
+@@ -28285,14 +23904,14 @@
_TAO_HomeDef_Proxy_Broker *the_TAO_HomeDef_Proxy_Broker_;
--
-+
+
protected:
- 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);
--
-- HomeDef (
-- TAO_Stub *objref,
+ 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 IR_HomeDef_setup_collocation (int collocated);
+
+- HomeDef (
+ IR_HomeDef (
-+ TAO_Stub *objref,
+ 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;
--
+@@ -28302,10 +23921,10 @@
+ friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_HomeDef_Direct_Proxy_Impl;
+
- virtual ~HomeDef (void);
--private:
++ virtual ~IR_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:
++ IR_HomeDef (const IR_HomeDef &);
++ void operator= (const IR_HomeDef &);
+
+ #if (TAO_HAS_INTERCEPTORS == 1)
+ // Generation of interceptors related RequestInfo classes per operation.
+@@ -28315,7 +23934,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_HomeDef;
+
+ friend class _TAO_HomeDef_Remote_Proxy_Impl;
+ friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+@@ -28349,15 +23968,15 @@
+ 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
++ 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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_HomeDef;
+
+ friend class _TAO_HomeDef_Remote_Proxy_Impl;
+ friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+@@ -28391,15 +24010,15 @@
+ 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
++ 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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_HomeDef;
+
+ friend class _TAO_HomeDef_Remote_Proxy_Impl;
+ friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+@@ -28433,15 +24052,15 @@
+ 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
++ void result (IR_PrimaryKeyDef_ptr result);
+ // update the result
- IR::PrimaryKeyDef_ptr _result;
--};
--
--class TAO_ClientRequestInfo_IR_HomeDef_factories_get : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_HomeDef;
+
+ friend class _TAO_HomeDef_Remote_Proxy_Impl;
+ friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+@@ -28475,15 +24094,15 @@
+ 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
++ void result (IR_FactoryDefSeq * result);
+ // update the result
- IR::FactoryDefSeq * _result;
--};
--
--class TAO_ClientRequestInfo_IR_HomeDef_finders_get : public TAO_ClientRequestInfo
--{
--public:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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 &);
++ friend class IR_HomeDef;
+
+ friend class _TAO_HomeDef_Remote_Proxy_Impl;
+ friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+@@ -28517,15 +24136,15 @@
+ 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
++ void result (IR_FinderDefSeq * result);
+ // update the result
- IR::FinderDefSeq * _result;
--};
++ IR_FinderDefSeq * _result;
+ };
--class TAO_ClientRequestInfo_IR_HomeDef_is_basic_get : public TAO_ClientRequestInfo
--{
--public:
+ class TAO_ClientRequestInfo_IR_HomeDef_is_basic_get : public TAO_ClientRequestInfo
+ {
+ public:
- friend class IR::HomeDef;
--
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _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:
+@@ -28567,7 +24186,7 @@
+ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++ friend class IR_HomeDef;
+
+ friend class _TAO_HomeDef_Remote_Proxy_Impl;
+ friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+@@ -28579,7 +24198,7 @@
+ 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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -28608,16 +24227,16 @@
+ const char * id_;
+ const char * name_;
+ const char * version_;
- IR::ValueDef_ptr primary_key_;
- void result (IR::PrimaryKeyDef_ptr result);
-- // update the result
++ 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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++ friend class IR_HomeDef;
+
+ friend class _TAO_HomeDef_Remote_Proxy_Impl;
+ friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+@@ -28629,8 +24248,8 @@
+ 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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -28659,17 +24278,17 @@
+ 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
++ 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:
++ 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 (
-- TAO_GIOP_Invocation *_tao_invocation,
-- CORBA::Object_ptr _tao_target,
-- const char * id,
-- const char * name,
-- const char * version,
++ friend class IR_HomeDef;
+
+ friend class _TAO_HomeDef_Remote_Proxy_Impl;
+ friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+@@ -28681,8 +24300,8 @@
+ 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,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+@@ -28711,11 +24330,11 @@
+ 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
++ 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 &);
++ IR_FinderDef_ptr _result;
};
-
-@@ -28768,13 +17135,13 @@
- // Base Impl. Declaration
+ #endif /* TAO_HAS_INTERCEPTORS */
+@@ -28733,12 +24352,12 @@
//
--class TAO_IFR_Client_Export _TAO_HomeDef_Proxy_Impl :
+ class TAO_IFR_Client_Export _TAO_HomeDef_Proxy_Impl :
- public virtual IR::_TAO_InterfaceDef_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_HomeDef_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
)
-@@ -28782,7 +17149,7 @@
+@@ -28746,7 +24365,7 @@
CORBA::SystemException
)) = 0;
@@ -33973,7 +24772,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -28790,7 +17157,7 @@
+@@ -28754,7 +24373,7 @@
CORBA::SystemException
)) = 0;
@@ -33982,7 +24781,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -28798,7 +17165,7 @@
+@@ -28762,7 +24381,7 @@
CORBA::SystemException
)) = 0;
@@ -33991,27 +24790,16 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -28806,54 +17173,54 @@
+@@ -28770,7 +24389,7 @@
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
+ CORBA::Environment &ACE_TRY_ENV
)
- ACE_THROW_SPEC ((
+@@ -28786,38 +24405,38 @@
CORBA::SystemException
)) = 0;
@@ -34058,7 +24846,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -28864,6 +17231,7 @@
+@@ -28828,6 +24447,7 @@
_TAO_HomeDef_Proxy_Impl (void);
};
@@ -34066,32 +24854,25 @@
//
// Base Proxy Impl. Declaration
///////////////////////////////////////////////////////////////////////
-@@ -28873,18 +17241,18 @@
- // Remote Impl. Declaration
- //
-
--class TAO_IFR_Client_Export _TAO_HomeDef_Remote_Proxy_Impl :
-+class TAO_IFR_Client_Export _TAO_HomeDef_Remote_Proxy_Impl :
+@@ -28840,7 +24460,7 @@
+ class TAO_IFR_Client_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:
- _TAO_HomeDef_Remote_Proxy_Impl (void);
--
-+
+@@ -28848,7 +24468,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
)
-@@ -28892,7 +17260,7 @@
+@@ -28856,7 +24476,7 @@
CORBA::SystemException
));
@@ -34100,7 +24881,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -28900,7 +17268,7 @@
+@@ -28864,7 +24484,7 @@
CORBA::SystemException
));
@@ -34109,7 +24890,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -28908,7 +17276,7 @@
+@@ -28872,7 +24492,7 @@
CORBA::SystemException
));
@@ -34118,7 +24899,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -28916,7 +17284,7 @@
+@@ -28880,7 +24500,7 @@
CORBA::SystemException
));
@@ -34127,7 +24908,7 @@
CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
-@@ -28932,38 +17300,38 @@
+@@ -28896,38 +24516,38 @@
CORBA::SystemException
));
@@ -34174,24 +24955,7 @@
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
-@@ -28978,49 +17346,50 @@
-
-
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new
-+// 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.
-+// a call by call basis.
-
-
-
- ///////////////////////////////////////////////////////////////////////
--// Base Proxy Broker Declaration
-+// Base Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_HomeDef_Proxy_Broker
+@@ -28956,8 +24576,9 @@
{
public:
virtual ~_TAO_HomeDef_Proxy_Broker (void);
@@ -34202,48 +24966,30 @@
CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
) = 0;
- protected:
- _TAO_HomeDef_Proxy_Broker (void);
--
-+
+@@ -28966,6 +24587,7 @@
+
};
-
++
//
--// End Base Proxy Broker Declaration
-+// End Base Proxy Broker Declaration
+ // End Base Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////////////////////////////////
--// Remote Proxy Broker Declaration
-+// Remote Proxy Broker Declaration
- //
-
- class TAO_IFR_Client_Export _TAO_HomeDef_Remote_Proxy_Broker : public virtual _TAO_HomeDef_Proxy_Broker
- {
--public:
-+public:
- _TAO_HomeDef_Remote_Proxy_Broker (void);
--
-+
+@@ -28983,7 +24605,7 @@
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 ()
);
-@@ -29034,24 +17403,15 @@
+@@ -28997,24 +24619,15 @@
static _TAO_HomeDef_Remote_Proxy_Broker *the_TAO_HomeDef_Remote_Proxy_Broker (void);
};
-
//
--// End Remote Proxy Broker Declaration
-+// End Remote Proxy Broker Declaration
+ // End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-
@@ -34264,7 +25010,7 @@
#endif /* ! __GNUC__ || g++ >= 2.8 */
static void _tao_any_destructor (void*);
-@@ -29062,1033 +17422,875 @@
+@@ -29025,1073 +24638,914 @@
TAO_String_Manager version;
TAO_String_Manager base_home;
TAO_String_Manager managed_component;
@@ -34289,74 +25035,58 @@
- HomeDescription_var (HomeDescription *);
- HomeDescription_var (const HomeDescription_var &); // copy constructor
- ~HomeDescription_var (void); // destructor
--
++ 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
+
- HomeDescription_var &operator= (HomeDescription *);
- HomeDescription_var &operator= (const HomeDescription_var &);
- HomeDescription *operator-> (void);
- const HomeDescription *operator-> (void) const;
--
++ 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 HomeDescription &() const;
- operator HomeDescription &();
- operator HomeDescription &() const;
- operator HomeDescription *&(); // variable-size types only
--
-- // in, inout, out, _retn
++ 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;
--
--private:
-- HomeDescription *ptr_;
--};
--
--class TAO_IFR_Client_Export 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_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 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_;
-- // assignment from T_var not allowed
-- void operator= (const HomeDescription_var &);
+- HomeDescription *ptr_;
+ IR_HomeDescription *ptr_;
};
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_HomeDescription;
--
+-class TAO_IFR_Client_Export HomeDescription_out
+class TAO_IFR_Client_Export IR_HomeDescription_out
-+{
-+public:
+ {
+ 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 &);
@@ -34365,33 +25095,218 @@
+ 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
-+private:
-+ IR_HomeDescription *&ptr_;
-+ // assignment from T_var not allowed
-+ void operator= (const IR_HomeDescription_var &);
-+};
+-
+ // Proxy Broker Factory function pointer declarations.
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::DefinitionKind);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::DefinitionKind &);
-extern TAO_IFR_Client_Export CORBA::_TAO_IRObject_Proxy_Broker * (*CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer) (
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_DefinitionKind);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_DefinitionKind &);
+extern TAO_IFR_Client_Export _TAO_IRObject_Proxy_Broker * (*_TAO_IRObject_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
--// Any operators for interface CORBA::IRObject
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::IRObject_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::IRObject *&);
+
-extern TAO_IFR_Client_Export IR::_TAO_Contained_Proxy_Broker * (*IR__TAO_Contained_Proxy_Broker_Factory_function_pointer) (
-+// Any operators for interface CORBA_IRObject
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_IRObject_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_IRObject *&);
+extern TAO_IFR_Client_Export _TAO_Contained_Proxy_Broker * (*_TAO_Contained_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
+
+-extern TAO_IFR_Client_Export IR::_TAO_Container_Proxy_Broker * (*IR__TAO_Container_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_Container_Proxy_Broker * (*_TAO_Container_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_IDLType_Proxy_Broker * (*IR__TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_IDLType_Proxy_Broker * (*_TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_Repository_Proxy_Broker * (*IR__TAO_Repository_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_Repository_Proxy_Broker * (*_TAO_Repository_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_ComponentRepository_Proxy_Broker * (*IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_ComponentRepository_Proxy_Broker * (*_TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_ModuleDef_Proxy_Broker * (*IR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_ModuleDef_Proxy_Broker * (*_TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_ConstantDef_Proxy_Broker * (*IR__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_ConstantDef_Proxy_Broker * (*_TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_TypedefDef_Proxy_Broker * (*IR__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_TypedefDef_Proxy_Broker * (*_TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_StructDef_Proxy_Broker * (*IR__TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_StructDef_Proxy_Broker * (*_TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_UnionDef_Proxy_Broker * (*IR__TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_UnionDef_Proxy_Broker * (*_TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_EnumDef_Proxy_Broker * (*IR__TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_EnumDef_Proxy_Broker * (*_TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_AliasDef_Proxy_Broker * (*IR__TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_AliasDef_Proxy_Broker * (*_TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_NativeDef_Proxy_Broker * (*IR__TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_NativeDef_Proxy_Broker * (*_TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_PrimitiveDef_Proxy_Broker * (*IR__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_PrimitiveDef_Proxy_Broker * (*_TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_StringDef_Proxy_Broker * (*IR__TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_StringDef_Proxy_Broker * (*_TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_WstringDef_Proxy_Broker * (*IR__TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_WstringDef_Proxy_Broker * (*_TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_FixedDef_Proxy_Broker * (*IR__TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_FixedDef_Proxy_Broker * (*_TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_SequenceDef_Proxy_Broker * (*IR__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_SequenceDef_Proxy_Broker * (*_TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_ArrayDef_Proxy_Broker * (*IR__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_ArrayDef_Proxy_Broker * (*_TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_ExceptionDef_Proxy_Broker * (*IR__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_ExceptionDef_Proxy_Broker * (*_TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_AttributeDef_Proxy_Broker * (*IR__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_AttributeDef_Proxy_Broker * (*_TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_OperationDef_Proxy_Broker * (*IR__TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_OperationDef_Proxy_Broker * (*_TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_InterfaceDef_Proxy_Broker * (*IR__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_InterfaceDef_Proxy_Broker * (*_TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_ValueMemberDef_Proxy_Broker * (*IR__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_ValueMemberDef_Proxy_Broker * (*_TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_ValueDef_Proxy_Broker * (*IR__TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_ValueDef_Proxy_Broker * (*_TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_ValueBoxDef_Proxy_Broker * (*IR__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_ValueBoxDef_Proxy_Broker * (*_TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_ProvidesDef_Proxy_Broker * (*IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_ProvidesDef_Proxy_Broker * (*_TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_UsesDef_Proxy_Broker * (*IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_UsesDef_Proxy_Broker * (*_TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_EventDef_Proxy_Broker * (*IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_EventDef_Proxy_Broker * (*_TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_EmitsDef_Proxy_Broker * (*IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_EmitsDef_Proxy_Broker * (*_TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_PublishesDef_Proxy_Broker * (*IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_PublishesDef_Proxy_Broker * (*_TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_ConsumesDef_Proxy_Broker * (*IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_ConsumesDef_Proxy_Broker * (*_TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_ComponentDef_Proxy_Broker * (*IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_ComponentDef_Proxy_Broker * (*_TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_PrimaryKeyDef_Proxy_Broker * (*IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Proxy_Broker * (*_TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_FactoryDef_Proxy_Broker * (*IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_FactoryDef_Proxy_Broker * (*_TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_FinderDef_Proxy_Broker * (*IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_FinderDef_Proxy_Broker * (*_TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-extern TAO_IFR_Client_Export IR::_TAO_HomeDef_Proxy_Broker * (*IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
++extern TAO_IFR_Client_Export _TAO_HomeDef_Proxy_Broker * (*_TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::DefinitionKind);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::DefinitionKind &);
+-// Any operators for interface CORBA::IRObject
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::IRObject_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::IRObject *&);
-// Any operators for interface IR::Contained
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::Contained_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Contained *&);
@@ -34475,7 +25390,239 @@
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EnumMemberSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EnumMemberSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::EnumMemberSeq *&);
--extern TAO_IFR_Client_Export IR::_TAO_Container_Proxy_Broker * (*IR__TAO_Container_Proxy_Broker_Factory_function_pointer) (
+-// Any operators for interface IR::Container
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::Container_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Container *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::Container::Description &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::Container::Description*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Container::Description *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::Container::Description *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::Container::DescriptionSeq &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::Container::DescriptionSeq*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Container::DescriptionSeq *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::Container::DescriptionSeq *&);
+-// Any operators for interface IR::IDLType
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::IDLType_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::IDLType *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PrimitiveKind);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimitiveKind &);
+-// Any operators for interface IR::Repository
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::Repository_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Repository *&);
+-// Any operators for interface IR::ComponentRepository
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentRepository_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentRepository *&);
+-// Any operators for interface IR::ModuleDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ModuleDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ModuleDef *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ModuleDescription &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ModuleDescription*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ModuleDescription *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ModuleDescription *&);
+-// Any operators for interface IR::ConstantDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ConstantDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ConstantDef *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ConstantDescription &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ConstantDescription*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ConstantDescription *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ConstantDescription *&);
+-// Any operators for interface IR::TypedefDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::TypedefDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::TypedefDef *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::TypeDescription &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::TypeDescription*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::TypeDescription *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::TypeDescription *&);
+-// Any operators for interface IR::StructDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::StructDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::StructDef *&);
+-// Any operators for interface IR::UnionDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UnionDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UnionDef *&);
+-// Any operators for interface IR::EnumDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EnumDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EnumDef *&);
+-// Any operators for interface IR::AliasDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::AliasDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::AliasDef *&);
+-// Any operators for interface IR::NativeDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::NativeDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::NativeDef *&);
+-// Any operators for interface IR::PrimitiveDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PrimitiveDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimitiveDef *&);
+-// Any operators for interface IR::StringDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::StringDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::StringDef *&);
+-// Any operators for interface IR::WstringDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::WstringDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::WstringDef *&);
+-// Any operators for interface IR::FixedDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FixedDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FixedDef *&);
+-// Any operators for interface IR::SequenceDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::SequenceDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::SequenceDef *&);
+-// Any operators for interface IR::ArrayDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ArrayDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ArrayDef *&);
+-// Any operators for interface IR::ExceptionDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ExceptionDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ExceptionDef *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ExceptionDescription &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ExceptionDescription*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ExceptionDescription *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ExceptionDescription *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ExceptionDefSeq &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ExceptionDefSeq*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ExceptionDefSeq *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ExceptionDefSeq *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ExcDescriptionSeq &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ExcDescriptionSeq*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ExcDescriptionSeq *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ExcDescriptionSeq *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::AttributeMode);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::AttributeMode &);
+-// Any operators for interface IR::AttributeDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::AttributeDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::AttributeDef *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::AttributeDescription &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::AttributeDescription*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::AttributeDescription *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::AttributeDescription *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::OperationMode);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::OperationMode &);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ParameterMode);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ParameterMode &);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ParameterDescription &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ParameterDescription*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ParameterDescription *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ParameterDescription *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ParDescriptionSeq &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ParDescriptionSeq*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ParDescriptionSeq *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ParDescriptionSeq *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ContextIdSeq &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ContextIdSeq*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ContextIdSeq *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ContextIdSeq *&);
+-// Any operators for interface IR::OperationDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::OperationDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::OperationDef *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::OperationDescription &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::OperationDescription*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::OperationDescription *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::OperationDescription *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::RepositoryIdSeq &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::RepositoryIdSeq*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::RepositoryIdSeq *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::RepositoryIdSeq *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::OpDescriptionSeq &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::OpDescriptionSeq*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::OpDescriptionSeq *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::OpDescriptionSeq *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::AttrDescriptionSeq &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::AttrDescriptionSeq*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::AttrDescriptionSeq *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::AttrDescriptionSeq *&);
+-// Any operators for interface IR::InterfaceDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::InterfaceDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::InterfaceDef *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::InterfaceDescription &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::InterfaceDescription*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::InterfaceDescription *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::InterfaceDescription *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ValueMember &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ValueMember*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueMember *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ValueMember *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ValueMemberSeq &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ValueMemberSeq*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueMemberSeq *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ValueMemberSeq *&);
+-// Any operators for interface IR::ValueMemberDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ValueMemberDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueMemberDef *&);
+-// Any operators for interface IR::ValueDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ValueDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueDef *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ValueDescription &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ValueDescription*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueDescription *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ValueDescription *&);
+-// Any operators for interface IR::ValueBoxDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ValueBoxDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueBoxDef *&);
+-// Any operators for interface IR::ProvidesDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDef *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ProvidesDescription &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDescription*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDescription *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ProvidesDescription *&);
+-// Any operators for interface IR::UsesDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDef *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::UsesDescription &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDescription*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDescription *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::UsesDescription *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ProvidesDescSeq &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDescSeq*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDescSeq *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ProvidesDescSeq *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::UsesDescSeq &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDescSeq*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDescSeq *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::UsesDescSeq *&);
+-// Any operators for interface IR::EventDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EventDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EventDef *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::EventDescription &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EventDescription*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EventDescription *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::EventDescription *&);
+-// Any operators for interface IR::EmitsDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EmitsDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EmitsDef *&);
+-// Any operators for interface IR::PublishesDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PublishesDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PublishesDef *&);
+-// Any operators for interface IR::ConsumesDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ConsumesDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ConsumesDef *&);
+-// Any operators for interface IR::ComponentDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentDef *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ComponentDescription &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentDescription*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentDescription *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ComponentDescription *&);
+-// Any operators for interface IR::PrimaryKeyDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PrimaryKeyDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimaryKeyDef *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::PrimaryKeyDescription &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PrimaryKeyDescription*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimaryKeyDescription *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::PrimaryKeyDescription *&);
+-// Any operators for interface IR::FactoryDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FactoryDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FactoryDef *&);
+-// Any operators for interface IR::FinderDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FinderDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FinderDef *&);
+-// Any operators for interface IR::HomeDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::HomeDef_ptr);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::HomeDef *&);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::HomeDescription &); // copying version
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::HomeDescription*); // noncopying version
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::HomeDescription *&); // deprecated
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::HomeDescription *&);
++TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_DefinitionKind);
++TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_DefinitionKind &);
++// Any operators for interface CORBA_IRObject
++TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_IRObject_ptr);
++TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_IRObject *&);
+// Any operators for interface IR_Contained
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_Contained_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Contained *&);
@@ -34559,22 +25706,6 @@
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_EnumMemberSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EnumMemberSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_EnumMemberSeq *&);
-+extern TAO_IFR_Client_Export _TAO_Container_Proxy_Broker * (*_TAO_Container_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::Container
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::Container_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Container *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::Container::Description &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::Container::Description*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Container::Description *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::Container::Description *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::Container::DescriptionSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::Container::DescriptionSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Container::DescriptionSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::Container::DescriptionSeq *&);
--extern TAO_IFR_Client_Export IR::_TAO_IDLType_Proxy_Broker * (*IR__TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
-+// Any operators for interface IR_Container
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_Container_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Container *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_Container::Description &); // copying version
@@ -34585,51 +25716,17 @@
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_Container::DescriptionSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Container::DescriptionSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_Container::DescriptionSeq *&);
-+extern TAO_IFR_Client_Export _TAO_IDLType_Proxy_Broker * (*_TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::IDLType
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::IDLType_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::IDLType *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PrimitiveKind);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimitiveKind &);
--extern TAO_IFR_Client_Export IR::_TAO_Repository_Proxy_Broker * (*IR__TAO_Repository_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_IDLType
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_IDLType_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_IDLType *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_PrimitiveKind);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PrimitiveKind &);
-+extern TAO_IFR_Client_Export _TAO_Repository_Proxy_Broker * (*_TAO_Repository_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::Repository
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::Repository_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Repository *&);
--extern TAO_IFR_Client_Export IR::_TAO_ComponentRepository_Proxy_Broker * (*IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_Repository
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_Repository_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Repository *&);
-+extern TAO_IFR_Client_Export _TAO_ComponentRepository_Proxy_Broker * (*_TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::ComponentRepository
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentRepository_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentRepository *&);
--extern TAO_IFR_Client_Export IR::_TAO_ModuleDef_Proxy_Broker * (*IR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_ComponentRepository
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ComponentRepository_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ComponentRepository *&);
-+extern TAO_IFR_Client_Export _TAO_ModuleDef_Proxy_Broker * (*_TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::ModuleDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ModuleDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ModuleDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ModuleDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ModuleDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ModuleDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ModuleDescription *&);
--extern TAO_IFR_Client_Export IR::_TAO_ConstantDef_Proxy_Broker * (*IR__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_ModuleDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ModuleDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ModuleDef *&);
@@ -34637,17 +25734,6 @@
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ModuleDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ModuleDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ModuleDescription *&);
-+extern TAO_IFR_Client_Export _TAO_ConstantDef_Proxy_Broker * (*_TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::ConstantDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ConstantDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ConstantDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ConstantDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ConstantDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ConstantDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ConstantDescription *&);
--extern TAO_IFR_Client_Export IR::_TAO_TypedefDef_Proxy_Broker * (*IR__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_ConstantDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ConstantDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ConstantDef *&);
@@ -34655,17 +25741,6 @@
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ConstantDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ConstantDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ConstantDescription *&);
-+extern TAO_IFR_Client_Export _TAO_TypedefDef_Proxy_Broker * (*_TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::TypedefDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::TypedefDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::TypedefDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::TypeDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::TypeDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::TypeDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::TypeDescription *&);
--extern TAO_IFR_Client_Export IR::_TAO_StructDef_Proxy_Broker * (*IR__TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_TypedefDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_TypedefDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_TypedefDef *&);
@@ -34673,137 +25748,39 @@
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_TypeDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_TypeDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_TypeDescription *&);
-+extern TAO_IFR_Client_Export _TAO_StructDef_Proxy_Broker * (*_TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::StructDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::StructDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::StructDef *&);
--extern TAO_IFR_Client_Export IR::_TAO_UnionDef_Proxy_Broker * (*IR__TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_StructDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_StructDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_StructDef *&);
-+extern TAO_IFR_Client_Export _TAO_UnionDef_Proxy_Broker * (*_TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::UnionDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UnionDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UnionDef *&);
--extern TAO_IFR_Client_Export IR::_TAO_EnumDef_Proxy_Broker * (*IR__TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_UnionDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_UnionDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UnionDef *&);
-+extern TAO_IFR_Client_Export _TAO_EnumDef_Proxy_Broker * (*_TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::EnumDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EnumDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EnumDef *&);
--extern TAO_IFR_Client_Export IR::_TAO_AliasDef_Proxy_Broker * (*IR__TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_EnumDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_EnumDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EnumDef *&);
-+extern TAO_IFR_Client_Export _TAO_AliasDef_Proxy_Broker * (*_TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::AliasDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::AliasDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::AliasDef *&);
--extern TAO_IFR_Client_Export IR::_TAO_NativeDef_Proxy_Broker * (*IR__TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_AliasDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_AliasDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AliasDef *&);
-+extern TAO_IFR_Client_Export _TAO_NativeDef_Proxy_Broker * (*_TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::NativeDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::NativeDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::NativeDef *&);
--extern TAO_IFR_Client_Export IR::_TAO_PrimitiveDef_Proxy_Broker * (*IR__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_NativeDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_NativeDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_NativeDef *&);
-+extern TAO_IFR_Client_Export _TAO_PrimitiveDef_Proxy_Broker * (*_TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::PrimitiveDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PrimitiveDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimitiveDef *&);
--extern TAO_IFR_Client_Export IR::_TAO_StringDef_Proxy_Broker * (*IR__TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_PrimitiveDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_PrimitiveDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PrimitiveDef *&);
-+extern TAO_IFR_Client_Export _TAO_StringDef_Proxy_Broker * (*_TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::StringDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::StringDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::StringDef *&);
--extern TAO_IFR_Client_Export IR::_TAO_WstringDef_Proxy_Broker * (*IR__TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_StringDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_StringDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_StringDef *&);
-+extern TAO_IFR_Client_Export _TAO_WstringDef_Proxy_Broker * (*_TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::WstringDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::WstringDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::WstringDef *&);
--extern TAO_IFR_Client_Export IR::_TAO_FixedDef_Proxy_Broker * (*IR__TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_WstringDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_WstringDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_WstringDef *&);
-+extern TAO_IFR_Client_Export _TAO_FixedDef_Proxy_Broker * (*_TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::FixedDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FixedDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FixedDef *&);
--extern TAO_IFR_Client_Export IR::_TAO_SequenceDef_Proxy_Broker * (*IR__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_FixedDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_FixedDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_FixedDef *&);
-+extern TAO_IFR_Client_Export _TAO_SequenceDef_Proxy_Broker * (*_TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::SequenceDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::SequenceDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::SequenceDef *&);
--extern TAO_IFR_Client_Export IR::_TAO_ArrayDef_Proxy_Broker * (*IR__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_SequenceDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_SequenceDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_SequenceDef *&);
-+extern TAO_IFR_Client_Export _TAO_ArrayDef_Proxy_Broker * (*_TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::ArrayDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ArrayDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ArrayDef *&);
--extern TAO_IFR_Client_Export IR::_TAO_ExceptionDef_Proxy_Broker * (*IR__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_ArrayDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ArrayDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ArrayDef *&);
-+extern TAO_IFR_Client_Export _TAO_ExceptionDef_Proxy_Broker * (*_TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::ExceptionDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ExceptionDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ExceptionDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ExceptionDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ExceptionDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ExceptionDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ExceptionDescription *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ExceptionDefSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ExceptionDefSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ExceptionDefSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ExceptionDefSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ExcDescriptionSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ExcDescriptionSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ExcDescriptionSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ExcDescriptionSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::AttributeMode);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::AttributeMode &);
--extern TAO_IFR_Client_Export IR::_TAO_AttributeDef_Proxy_Broker * (*IR__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_ExceptionDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ExceptionDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ExceptionDef *&);
@@ -34821,33 +25798,6 @@
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ExcDescriptionSeq *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_AttributeMode);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AttributeMode &);
-+extern TAO_IFR_Client_Export _TAO_AttributeDef_Proxy_Broker * (*_TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::AttributeDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::AttributeDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::AttributeDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::AttributeDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::AttributeDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::AttributeDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::AttributeDescription *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::OperationMode);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::OperationMode &);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ParameterMode);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ParameterMode &);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ParameterDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ParameterDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ParameterDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ParameterDescription *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ParDescriptionSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ParDescriptionSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ParDescriptionSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ParDescriptionSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ContextIdSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ContextIdSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ContextIdSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ContextIdSeq *&);
--extern TAO_IFR_Client_Export IR::_TAO_OperationDef_Proxy_Broker * (*IR__TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_AttributeDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_AttributeDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AttributeDef *&);
@@ -34871,29 +25821,6 @@
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ContextIdSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ContextIdSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ContextIdSeq *&);
-+extern TAO_IFR_Client_Export _TAO_OperationDef_Proxy_Broker * (*_TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::OperationDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::OperationDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::OperationDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::OperationDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::OperationDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::OperationDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::OperationDescription *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::RepositoryIdSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::RepositoryIdSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::RepositoryIdSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::RepositoryIdSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::OpDescriptionSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::OpDescriptionSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::OpDescriptionSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::OpDescriptionSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::AttrDescriptionSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::AttrDescriptionSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::AttrDescriptionSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::AttrDescriptionSeq *&);
--extern TAO_IFR_Client_Export IR::_TAO_InterfaceDef_Proxy_Broker * (*IR__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_OperationDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_OperationDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_OperationDef *&);
@@ -34913,25 +25840,6 @@
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_AttrDescriptionSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AttrDescriptionSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_AttrDescriptionSeq *&);
-+extern TAO_IFR_Client_Export _TAO_InterfaceDef_Proxy_Broker * (*_TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::InterfaceDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::InterfaceDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::InterfaceDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::InterfaceDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::InterfaceDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::InterfaceDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::InterfaceDescription *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ValueMember &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ValueMember*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueMember *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ValueMember *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ValueMemberSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ValueMemberSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueMemberSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ValueMemberSeq *&);
--extern TAO_IFR_Client_Export IR::_TAO_ValueMemberDef_Proxy_Broker * (*IR__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_InterfaceDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_InterfaceDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_InterfaceDef *&);
@@ -34947,27 +25855,9 @@
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ValueMemberSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueMemberSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ValueMemberSeq *&);
-+extern TAO_IFR_Client_Export _TAO_ValueMemberDef_Proxy_Broker * (*_TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::ValueMemberDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ValueMemberDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueMemberDef *&);
--extern TAO_IFR_Client_Export IR::_TAO_ValueDef_Proxy_Broker * (*IR__TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_ValueMemberDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ValueMemberDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueMemberDef *&);
-+extern TAO_IFR_Client_Export _TAO_ValueDef_Proxy_Broker * (*_TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::ValueDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ValueDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ValueDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ValueDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ValueDescription *&);
--extern TAO_IFR_Client_Export IR::_TAO_ValueBoxDef_Proxy_Broker * (*IR__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_ValueDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ValueDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueDef *&);
@@ -34975,27 +25865,9 @@
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ValueDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ValueDescription *&);
-+extern TAO_IFR_Client_Export _TAO_ValueBoxDef_Proxy_Broker * (*_TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::ValueBoxDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ValueBoxDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueBoxDef *&);
--extern TAO_IFR_Client_Export IR::_TAO_ProvidesDef_Proxy_Broker * (*IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_ValueBoxDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ValueBoxDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueBoxDef *&);
-+extern TAO_IFR_Client_Export _TAO_ProvidesDef_Proxy_Broker * (*_TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::ProvidesDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ProvidesDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ProvidesDescription *&);
--extern TAO_IFR_Client_Export IR::_TAO_UsesDef_Proxy_Broker * (*IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_ProvidesDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ProvidesDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ProvidesDef *&);
@@ -35003,25 +25875,6 @@
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ProvidesDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ProvidesDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ProvidesDescription *&);
-+extern TAO_IFR_Client_Export _TAO_UsesDef_Proxy_Broker * (*_TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::UsesDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::UsesDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::UsesDescription *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ProvidesDescSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDescSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDescSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ProvidesDescSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::UsesDescSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDescSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDescSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::UsesDescSeq *&);
--extern TAO_IFR_Client_Export IR::_TAO_EventDef_Proxy_Broker * (*IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_UsesDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_UsesDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UsesDef *&);
@@ -35037,17 +25890,6 @@
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_UsesDescSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UsesDescSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_UsesDescSeq *&);
-+extern TAO_IFR_Client_Export _TAO_EventDef_Proxy_Broker * (*_TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::EventDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EventDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EventDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::EventDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EventDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EventDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::EventDescription *&);
--extern TAO_IFR_Client_Export IR::_TAO_EmitsDef_Proxy_Broker * (*IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_EventDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_EventDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EventDef *&);
@@ -35055,47 +25897,15 @@
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_EventDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EventDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_EventDescription *&);
-+extern TAO_IFR_Client_Export _TAO_EmitsDef_Proxy_Broker * (*_TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::EmitsDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EmitsDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EmitsDef *&);
--extern TAO_IFR_Client_Export IR::_TAO_PublishesDef_Proxy_Broker * (*IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_EmitsDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_EmitsDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EmitsDef *&);
-+extern TAO_IFR_Client_Export _TAO_PublishesDef_Proxy_Broker * (*_TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::PublishesDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PublishesDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PublishesDef *&);
--extern TAO_IFR_Client_Export IR::_TAO_ConsumesDef_Proxy_Broker * (*IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_PublishesDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_PublishesDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PublishesDef *&);
-+extern TAO_IFR_Client_Export _TAO_ConsumesDef_Proxy_Broker * (*_TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::ConsumesDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ConsumesDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ConsumesDef *&);
--extern TAO_IFR_Client_Export IR::_TAO_ComponentDef_Proxy_Broker * (*IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_ConsumesDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ConsumesDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ConsumesDef *&);
-+extern TAO_IFR_Client_Export _TAO_ComponentDef_Proxy_Broker * (*_TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::ComponentDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ComponentDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ComponentDescription *&);
--extern TAO_IFR_Client_Export IR::_TAO_PrimaryKeyDef_Proxy_Broker * (*IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_ComponentDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ComponentDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ComponentDef *&);
@@ -35103,17 +25913,6 @@
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ComponentDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ComponentDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ComponentDescription *&);
-+extern TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Proxy_Broker * (*_TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::PrimaryKeyDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PrimaryKeyDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimaryKeyDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::PrimaryKeyDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PrimaryKeyDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimaryKeyDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::PrimaryKeyDescription *&);
--extern TAO_IFR_Client_Export IR::_TAO_FactoryDef_Proxy_Broker * (*IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_PrimaryKeyDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_PrimaryKeyDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PrimaryKeyDef *&);
@@ -35121,36 +25920,12 @@
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_PrimaryKeyDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PrimaryKeyDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_PrimaryKeyDescription *&);
-+extern TAO_IFR_Client_Export _TAO_FactoryDef_Proxy_Broker * (*_TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::FactoryDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FactoryDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FactoryDef *&);
--extern TAO_IFR_Client_Export IR::_TAO_FinderDef_Proxy_Broker * (*IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_FactoryDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_FactoryDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_FactoryDef *&);
-+extern TAO_IFR_Client_Export _TAO_FinderDef_Proxy_Broker * (*_TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::FinderDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FinderDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FinderDef *&);
--extern TAO_IFR_Client_Export IR::_TAO_HomeDef_Proxy_Broker * (*IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
+// Any operators for interface IR_FinderDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_FinderDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_FinderDef *&);
-+extern TAO_IFR_Client_Export _TAO_HomeDef_Proxy_Broker * (*_TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
- CORBA::Object_ptr obj
- );
--// Any operators for interface IR::HomeDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::HomeDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::HomeDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::HomeDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::HomeDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::HomeDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::HomeDescription *&);
+// Any operators for interface IR_HomeDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_HomeDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_HomeDef *&);
@@ -35613,27 +26388,30 @@
-#endif /* _TAO_CDR_OP_IR_ExcDescriptionSeq_H_ */
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::AttributeMode &); //
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_AttributeMode &); //
- TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::AttributeMode &);
+-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::AttributeMode &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::AttributeDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::AttributeDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::AttributeDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::AttributeDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::OperationMode &); //
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_AttributeDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_AttributeDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_AttributeDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_AttributeDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_OperationMode &); //
- TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::OperationMode &);
+-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::OperationMode &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ParameterMode &); //
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ParameterMode &); //
- TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ParameterMode &);
+-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ParameterMode &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ParameterDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ParameterDescription &);
-
-#if !defined _TAO_CDR_OP_IR_ParDescriptionSeq_H_
-#define _TAO_CDR_OP_IR_ParDescriptionSeq_H_
++TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_AttributeMode &); //
++TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_AttributeMode &);
++TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_AttributeDef_ptr );
++TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_AttributeDef_ptr &);
++TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_AttributeDescription &);
++TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_AttributeDescription &);
++TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_OperationMode &); //
++TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_OperationMode &);
++TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ParameterMode &); //
++TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ParameterMode &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ParameterDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ParameterDescription &);
diff --git a/TAO/tao/IFR_Client/diffs/InterfaceC.i.diff b/TAO/tao/IFR_Client/diffs/InterfaceC.i.diff
index 8f9e6e2e8db..657f739e77e 100644
--- a/TAO/tao/IFR_Client/diffs/InterfaceC.i.diff
+++ b/TAO/tao/IFR_Client/diffs/InterfaceC.i.diff
@@ -1,5 +1,5 @@
---- InterfaceC.i Fri Jan 12 21:21:45 2001
-+++ ..\InterfaceC.i Thu Jan 11 16:37:38 2001
+--- orig/InterfaceC.i Fri Mar 09 00:47:29 2001
++++ InterfaceC.i Thu Mar 01 15:34:00 2001
@@ -1,6 +1,6 @@
// -*- C++ -*-
//
@@ -23,7 +23,7 @@
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
@@ -34,184 +30,164 @@
- this->_tao_setup_collocation (_tao_collocated);
+ this->CORBA_IRObject_setup_collocation (_tao_collocated);
}
-#endif /* end #if !defined */
@@ -257,7 +257,7 @@
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
@@ -221,185 +197,164 @@
- this->_tao_setup_collocation (_tao_collocated);
+ this->IR_Contained_setup_collocation (_tao_collocated);
}
-
@@ -492,7 +492,7 @@
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
@@ -409,185 +364,164 @@
- this->_tao_setup_collocation (_tao_collocated);
+ this->IR_Repository_setup_collocation (_tao_collocated);
}
-
@@ -726,8 +726,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -597,312 +531,295 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -597,218 +531,201 @@
+ this->IR_Container_setup_collocation (_tao_collocated);
}
-
@@ -1002,11 +1002,24 @@
+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);
- }
+ {
+@@ -819,12 +736,12 @@
+ }
+ else
+ {
+- Description *deep_copy =
+- new Description (*p.ptr_);
++ IR_Contained::Description *deep_copy =
++ new IR_Contained::Description (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- Description *tmp = deep_copy;
++ IR_Contained::Description *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -835,91 +752,91 @@
return *this;
}
@@ -1120,7 +1133,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -910,48 +827,44 @@
+@@ -927,48 +844,44 @@
}
ACE_INLINE
@@ -1180,8 +1193,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -961,185 +874,164 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -978,185 +891,164 @@
+ this->IR_ModuleDef_setup_collocation (_tao_collocated);
}
-
@@ -1415,8 +1428,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -1149,185 +1041,164 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -1166,185 +1058,164 @@
+ this->IR_ConstantDef_setup_collocation (_tao_collocated);
}
-
@@ -1650,8 +1663,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -1337,185 +1208,164 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -1354,185 +1225,164 @@
+ this->IR_IDLType_setup_collocation (_tao_collocated);
}
-
@@ -1885,8 +1898,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -1525,185 +1375,164 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -1542,185 +1392,164 @@
+ this->IR_StructDef_setup_collocation (_tao_collocated);
}
-
@@ -2120,8 +2133,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -1713,185 +1542,164 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -1730,185 +1559,164 @@
+ this->IR_UnionDef_setup_collocation (_tao_collocated);
}
-
@@ -2355,8 +2368,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -1901,185 +1709,164 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -1918,185 +1726,164 @@
+ this->IR_EnumDef_setup_collocation (_tao_collocated);
}
-
@@ -2590,8 +2603,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -2089,185 +1876,164 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -2106,185 +1893,164 @@
+ this->IR_AliasDef_setup_collocation (_tao_collocated);
}
-
@@ -2825,8 +2838,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -2277,185 +2043,164 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -2294,185 +2060,164 @@
+ this->IR_InterfaceDef_setup_collocation (_tao_collocated);
}
-
@@ -3060,8 +3073,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -2465,185 +2210,164 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -2482,185 +2227,164 @@
+ this->IR_ExceptionDef_setup_collocation (_tao_collocated);
}
-
@@ -3295,8 +3308,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -2653,200 +2377,179 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -2670,200 +2394,179 @@
+ this->IR_NativeDef_setup_collocation (_tao_collocated);
}
-
@@ -3550,7 +3563,7 @@
{
if (buffer == 0)
return;
-@@ -2854,36 +2557,36 @@
+@@ -2871,36 +2574,36 @@
}
ACE_INLINE
@@ -3595,7 +3608,7 @@
this->buffer_ = tmp1;
}
-@@ -2893,20 +2596,20 @@
+@@ -2910,20 +2613,20 @@
}
}
@@ -3620,7 +3633,7 @@
}
if (this->maximum_ < rhs.maximum_)
{
-@@ -2919,28 +2622,28 @@
+@@ -2936,28 +2639,28 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -3659,7 +3672,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -2952,7 +2655,7 @@
+@@ -2969,7 +2672,7 @@
}
else
{
@@ -3668,7 +3681,7 @@
}
}
else // if (orphan == 1)
-@@ -2961,7 +2664,7 @@
+@@ -2978,7 +2681,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -3677,7 +3690,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -2971,160 +2674,153 @@
+@@ -2988,60 +2691,53 @@
return result;
}
@@ -3744,17 +3757,30 @@
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)
+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);
- }
+ {
+@@ -3052,12 +2748,12 @@
+ }
+ else
+ {
+- InterfaceDefSeq *deep_copy =
+- new InterfaceDefSeq (*p.ptr_);
++ IR_InterfaceDefSeq *deep_copy =
++ new IR_InterfaceDefSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- InterfaceDefSeq *tmp = deep_copy;
++ IR_InterfaceDefSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -3068,97 +2764,97 @@
return *this;
}
@@ -3876,7 +3902,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -3132,57 +2828,50 @@
+@@ -3166,57 +2862,50 @@
}
ACE_INLINE
@@ -3949,8 +3975,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -3192,200 +2881,179 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -3226,200 +2915,179 @@
+ this->IR_ValueDef_setup_collocation (_tao_collocated);
}
-
@@ -4204,7 +4230,7 @@
{
if (buffer == 0)
return;
-@@ -3393,36 +3061,36 @@
+@@ -3427,36 +3095,36 @@
}
ACE_INLINE
@@ -4249,7 +4275,7 @@
this->buffer_ = tmp1;
}
-@@ -3432,20 +3100,20 @@
+@@ -3466,20 +3134,20 @@
}
}
@@ -4274,7 +4300,7 @@
}
if (this->maximum_ < rhs.maximum_)
{
-@@ -3458,28 +3126,28 @@
+@@ -3492,28 +3160,28 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -4313,7 +4339,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -3491,7 +3159,7 @@
+@@ -3525,7 +3193,7 @@
}
else
{
@@ -4322,7 +4348,7 @@
}
}
else // if (orphan == 1)
-@@ -3500,7 +3168,7 @@
+@@ -3534,7 +3202,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -4331,7 +4357,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -3510,160 +3178,153 @@
+@@ -3544,60 +3212,53 @@
return result;
}
@@ -4398,17 +4424,30 @@
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)
+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);
- }
+ {
+@@ -3608,12 +3269,12 @@
+ }
+ else
+ {
+- ValueDefSeq *deep_copy =
+- new ValueDefSeq (*p.ptr_);
++ IR_ValueDefSeq *deep_copy =
++ new IR_ValueDefSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- ValueDefSeq *tmp = deep_copy;
++ IR_ValueDefSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -3624,97 +3285,97 @@
return *this;
}
@@ -4530,7 +4569,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -3671,57 +3332,50 @@
+@@ -3722,57 +3383,50 @@
}
ACE_INLINE
@@ -4603,8 +4642,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -3731,185 +3385,164 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -3782,185 +3436,164 @@
+ this->IR_ValueBoxDef_setup_collocation (_tao_collocated);
}
-
@@ -4838,8 +4877,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -3919,200 +3552,179 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -3970,200 +3603,179 @@
+ this->IR_ComponentDef_setup_collocation (_tao_collocated);
}
-
@@ -5093,7 +5132,7 @@
{
if (buffer == 0)
return;
-@@ -4120,36 +3732,36 @@
+@@ -4171,36 +3783,36 @@
}
ACE_INLINE
@@ -5138,7 +5177,7 @@
this->buffer_ = tmp1;
}
-@@ -4159,20 +3771,20 @@
+@@ -4210,20 +3822,20 @@
}
}
@@ -5163,7 +5202,7 @@
}
if (this->maximum_ < rhs.maximum_)
{
-@@ -4185,28 +3797,28 @@
+@@ -4236,28 +3848,28 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -5202,7 +5241,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -4218,7 +3830,7 @@
+@@ -4269,7 +3881,7 @@
}
else
{
@@ -5211,7 +5250,7 @@
}
}
else // if (orphan == 1)
-@@ -4227,7 +3839,7 @@
+@@ -4278,7 +3890,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -5220,7 +5259,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -4237,160 +3849,153 @@
+@@ -4288,60 +3900,53 @@
return result;
}
@@ -5287,17 +5326,30 @@
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)
+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);
- }
+ {
+@@ -4352,12 +3957,12 @@
+ }
+ else
+ {
+- ComponentDefSeq *deep_copy =
+- new ComponentDefSeq (*p.ptr_);
++ IR_ComponentDefSeq *deep_copy =
++ new IR_ComponentDefSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- ComponentDefSeq *tmp = deep_copy;
++ IR_ComponentDefSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -4368,97 +3973,97 @@
return *this;
}
@@ -5419,7 +5471,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -4398,57 +4003,50 @@
+@@ -4466,57 +4071,50 @@
}
ACE_INLINE
@@ -5492,8 +5544,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -4458,200 +4056,179 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -4526,200 +4124,179 @@
+ this->IR_ProvidesDef_setup_collocation (_tao_collocated);
}
-
@@ -5747,7 +5799,7 @@
{
if (buffer == 0)
return;
-@@ -4659,36 +4236,36 @@
+@@ -4727,36 +4304,36 @@
}
ACE_INLINE
@@ -5792,7 +5844,7 @@
this->buffer_ = tmp1;
}
-@@ -4698,20 +4275,20 @@
+@@ -4766,20 +4343,20 @@
}
}
@@ -5817,7 +5869,7 @@
}
if (this->maximum_ < rhs.maximum_)
{
-@@ -4724,28 +4301,28 @@
+@@ -4792,28 +4369,28 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -5856,7 +5908,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -4757,7 +4334,7 @@
+@@ -4825,7 +4402,7 @@
}
else
{
@@ -5865,7 +5917,7 @@
}
}
else // if (orphan == 1)
-@@ -4766,7 +4343,7 @@
+@@ -4834,7 +4411,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -5874,7 +5926,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -4776,160 +4353,153 @@
+@@ -4844,60 +4421,53 @@
return result;
}
@@ -5941,17 +5993,30 @@
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)
+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);
- }
+ {
+@@ -4908,12 +4478,12 @@
+ }
+ else
+ {
+- ProvidesDefSeq *deep_copy =
+- new ProvidesDefSeq (*p.ptr_);
++ IR_ProvidesDefSeq *deep_copy =
++ new IR_ProvidesDefSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- ProvidesDefSeq *tmp = deep_copy;
++ IR_ProvidesDefSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -4924,97 +4494,97 @@
return *this;
}
@@ -6073,7 +6138,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -4937,57 +4507,50 @@
+@@ -5022,57 +4592,50 @@
}
ACE_INLINE
@@ -6146,8 +6211,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -4997,200 +4560,179 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -5082,200 +4645,179 @@
+ this->IR_UsesDef_setup_collocation (_tao_collocated);
}
-
@@ -6403,7 +6468,7 @@
{
if (buffer == 0)
return;
-@@ -5198,36 +4740,36 @@
+@@ -5283,36 +4825,36 @@
}
ACE_INLINE
@@ -6448,7 +6513,7 @@
this->buffer_ = tmp1;
}
-@@ -5237,20 +4779,20 @@
+@@ -5322,20 +4864,20 @@
}
}
@@ -6473,7 +6538,7 @@
}
if (this->maximum_ < rhs.maximum_)
{
-@@ -5263,28 +4805,28 @@
+@@ -5348,28 +4890,28 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -6512,7 +6577,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -5296,7 +4838,7 @@
+@@ -5381,7 +4923,7 @@
}
else
{
@@ -6521,7 +6586,7 @@
}
}
else // if (orphan == 1)
-@@ -5305,7 +4847,7 @@
+@@ -5390,7 +4932,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -6530,7 +6595,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -5315,160 +4857,153 @@
+@@ -5400,60 +4942,53 @@
return result;
}
@@ -6597,17 +6662,30 @@
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)
+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);
- }
+ {
+@@ -5464,12 +4999,12 @@
+ }
+ else
+ {
+- UsesDefSeq *deep_copy =
+- new UsesDefSeq (*p.ptr_);
++ IR_UsesDefSeq *deep_copy =
++ new IR_UsesDefSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- UsesDefSeq *tmp = deep_copy;
++ IR_UsesDefSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -5480,97 +5015,97 @@
return *this;
}
@@ -6729,7 +6807,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -5476,57 +5011,50 @@
+@@ -5578,57 +5113,50 @@
}
ACE_INLINE
@@ -6802,8 +6880,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -5536,200 +5064,179 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -5638,200 +5166,179 @@
+ this->IR_HomeDef_setup_collocation (_tao_collocated);
}
-
@@ -7057,7 +7135,7 @@
{
if (buffer == 0)
return;
-@@ -5737,36 +5244,36 @@
+@@ -5839,36 +5346,36 @@
}
ACE_INLINE
@@ -7102,7 +7180,7 @@
this->buffer_ = tmp1;
}
-@@ -5776,20 +5283,20 @@
+@@ -5878,20 +5385,20 @@
}
}
@@ -7127,7 +7205,7 @@
}
if (this->maximum_ < rhs.maximum_)
{
-@@ -5802,28 +5309,28 @@
+@@ -5904,28 +5411,28 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -7166,7 +7244,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -5835,7 +5342,7 @@
+@@ -5937,7 +5444,7 @@
}
else
{
@@ -7175,7 +7253,7 @@
}
}
else // if (orphan == 1)
-@@ -5844,7 +5351,7 @@
+@@ -5946,7 +5453,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -7184,7 +7262,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -5854,160 +5361,153 @@
+@@ -5956,60 +5463,53 @@
return result;
}
@@ -7251,17 +7329,30 @@
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)
+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);
- }
+ {
+@@ -6020,12 +5520,12 @@
+ }
+ else
+ {
+- HomeDefSeq *deep_copy =
+- new HomeDefSeq (*p.ptr_);
++ IR_HomeDefSeq *deep_copy =
++ new IR_HomeDefSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- HomeDefSeq *tmp = deep_copy;
++ IR_HomeDefSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -6036,97 +5536,97 @@
return *this;
}
@@ -7383,7 +7474,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -6015,57 +5515,50 @@
+@@ -6134,57 +5634,50 @@
}
ACE_INLINE
@@ -7456,8 +7547,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -6075,185 +5568,164 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -6194,185 +5687,164 @@
+ this->IR_EventDef_setup_collocation (_tao_collocated);
}
-
@@ -7691,8 +7782,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -6263,200 +5735,179 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -6382,200 +5854,179 @@
+ this->IR_EmitsDef_setup_collocation (_tao_collocated);
}
-
@@ -7946,7 +8037,7 @@
{
if (buffer == 0)
return;
-@@ -6464,36 +5915,36 @@
+@@ -6583,36 +6034,36 @@
}
ACE_INLINE
@@ -7991,7 +8082,7 @@
this->buffer_ = tmp1;
}
-@@ -6503,20 +5954,20 @@
+@@ -6622,20 +6073,20 @@
}
}
@@ -8016,7 +8107,7 @@
}
if (this->maximum_ < rhs.maximum_)
{
-@@ -6529,28 +5980,28 @@
+@@ -6648,28 +6099,28 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -8055,7 +8146,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -6562,7 +6013,7 @@
+@@ -6681,7 +6132,7 @@
}
else
{
@@ -8064,7 +8155,7 @@
}
}
else // if (orphan == 1)
-@@ -6571,7 +6022,7 @@
+@@ -6690,7 +6141,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -8073,7 +8164,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -6581,160 +6032,153 @@
+@@ -6700,60 +6151,53 @@
return result;
}
@@ -8140,17 +8231,30 @@
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)
+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);
- }
+ {
+@@ -6764,12 +6208,12 @@
+ }
+ else
+ {
+- EmitsDefSeq *deep_copy =
+- new EmitsDefSeq (*p.ptr_);
++ IR_EmitsDefSeq *deep_copy =
++ new IR_EmitsDefSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- EmitsDefSeq *tmp = deep_copy;
++ IR_EmitsDefSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -6780,97 +6224,97 @@
return *this;
}
@@ -8272,7 +8376,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -6742,57 +6186,50 @@
+@@ -6878,57 +6322,50 @@
}
ACE_INLINE
@@ -8345,8 +8449,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -6802,200 +6239,179 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -6938,200 +6375,179 @@
+ this->IR_PublishesDef_setup_collocation (_tao_collocated);
}
-
@@ -8600,7 +8704,7 @@
{
if (buffer == 0)
return;
-@@ -7003,36 +6419,36 @@
+@@ -7139,36 +6555,36 @@
}
ACE_INLINE
@@ -8645,7 +8749,7 @@
this->buffer_ = tmp1;
}
-@@ -7042,20 +6458,20 @@
+@@ -7178,20 +6594,20 @@
}
}
@@ -8670,7 +8774,7 @@
}
if (this->maximum_ < rhs.maximum_)
{
-@@ -7068,28 +6484,28 @@
+@@ -7204,28 +6620,28 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -8709,7 +8813,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -7101,7 +6517,7 @@
+@@ -7237,7 +6653,7 @@
}
else
{
@@ -8718,7 +8822,7 @@
}
}
else // if (orphan == 1)
-@@ -7110,7 +6526,7 @@
+@@ -7246,7 +6662,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -8727,7 +8831,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -7120,160 +6536,153 @@
+@@ -7256,60 +6672,53 @@
return result;
}
@@ -8794,17 +8898,30 @@
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)
+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);
- }
+ {
+@@ -7320,12 +6729,12 @@
+ }
+ else
+ {
+- PublishesDefSeq *deep_copy =
+- new PublishesDefSeq (*p.ptr_);
++ IR_PublishesDefSeq *deep_copy =
++ new IR_PublishesDefSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- PublishesDefSeq *tmp = deep_copy;
++ IR_PublishesDefSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -7336,97 +6745,97 @@
return *this;
}
@@ -8926,7 +9043,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -7281,57 +6690,50 @@
+@@ -7434,57 +6843,50 @@
}
ACE_INLINE
@@ -8999,8 +9116,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -7341,200 +6743,179 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -7494,200 +6896,179 @@
+ this->IR_ConsumesDef_setup_collocation (_tao_collocated);
}
-
@@ -9254,7 +9371,7 @@
{
if (buffer == 0)
return;
-@@ -7542,36 +6923,36 @@
+@@ -7695,36 +7076,36 @@
}
ACE_INLINE
@@ -9299,7 +9416,7 @@
this->buffer_ = tmp1;
}
-@@ -7581,20 +6962,20 @@
+@@ -7734,20 +7115,20 @@
}
}
@@ -9324,7 +9441,7 @@
}
if (this->maximum_ < rhs.maximum_)
{
-@@ -7607,28 +6988,28 @@
+@@ -7760,28 +7141,28 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -9363,7 +9480,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -7640,7 +7021,7 @@
+@@ -7793,7 +7174,7 @@
}
else
{
@@ -9372,7 +9489,7 @@
}
}
else // if (orphan == 1)
-@@ -7649,7 +7030,7 @@
+@@ -7802,7 +7183,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -9381,7 +9498,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -7659,160 +7040,153 @@
+@@ -7812,60 +7193,53 @@
return result;
}
@@ -9448,17 +9565,30 @@
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)
+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);
- }
+ {
+@@ -7876,12 +7250,12 @@
+ }
+ else
+ {
+- ConsumesDefSeq *deep_copy =
+- new ConsumesDefSeq (*p.ptr_);
++ IR_ConsumesDefSeq *deep_copy =
++ new IR_ConsumesDefSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- ConsumesDefSeq *tmp = deep_copy;
++ IR_ConsumesDefSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -7892,97 +7266,97 @@
return *this;
}
@@ -9580,7 +9710,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -7820,57 +7194,50 @@
+@@ -7990,57 +7364,50 @@
}
ACE_INLINE
@@ -9653,8 +9783,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -7880,200 +7247,179 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -8050,200 +7417,179 @@
+ this->IR_FactoryDef_setup_collocation (_tao_collocated);
}
-
@@ -9908,7 +10038,7 @@
{
if (buffer == 0)
return;
-@@ -8081,36 +7427,36 @@
+@@ -8251,36 +7597,36 @@
}
ACE_INLINE
@@ -9953,7 +10083,7 @@
this->buffer_ = tmp1;
}
-@@ -8120,20 +7466,20 @@
+@@ -8290,20 +7636,20 @@
}
}
@@ -9978,7 +10108,7 @@
}
if (this->maximum_ < rhs.maximum_)
{
-@@ -8146,28 +7492,28 @@
+@@ -8316,28 +7662,28 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -10017,7 +10147,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -8179,7 +7525,7 @@
+@@ -8349,7 +7695,7 @@
}
else
{
@@ -10026,7 +10156,7 @@
}
}
else // if (orphan == 1)
-@@ -8188,7 +7534,7 @@
+@@ -8358,7 +7704,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -10035,7 +10165,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -8198,160 +7544,153 @@
+@@ -8368,60 +7714,53 @@
return result;
}
@@ -10102,17 +10232,30 @@
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)
+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);
- }
+ {
+@@ -8432,12 +7771,12 @@
+ }
+ else
+ {
+- FactoryDefSeq *deep_copy =
+- new FactoryDefSeq (*p.ptr_);
++ IR_FactoryDefSeq *deep_copy =
++ new IR_FactoryDefSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- FactoryDefSeq *tmp = deep_copy;
++ IR_FactoryDefSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -8448,97 +7787,97 @@
return *this;
}
@@ -10234,7 +10377,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -8359,57 +7698,50 @@
+@@ -8546,57 +7885,50 @@
}
ACE_INLINE
@@ -10307,8 +10450,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -8419,200 +7751,179 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -8606,200 +7938,179 @@
+ this->IR_FinderDef_setup_collocation (_tao_collocated);
}
-
@@ -10562,7 +10705,7 @@
{
if (buffer == 0)
return;
-@@ -8620,36 +7931,36 @@
+@@ -8807,36 +8118,36 @@
}
ACE_INLINE
@@ -10607,7 +10750,7 @@
this->buffer_ = tmp1;
}
-@@ -8659,20 +7970,20 @@
+@@ -8846,20 +8157,20 @@
}
}
@@ -10632,7 +10775,7 @@
}
if (this->maximum_ < rhs.maximum_)
{
-@@ -8685,28 +7996,28 @@
+@@ -8872,28 +8183,28 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -10671,7 +10814,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -8718,7 +8029,7 @@
+@@ -8905,7 +8216,7 @@
}
else
{
@@ -10680,7 +10823,7 @@
}
}
else // if (orphan == 1)
-@@ -8727,7 +8038,7 @@
+@@ -8914,7 +8225,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -10689,7 +10832,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -8737,160 +8048,153 @@
+@@ -8924,60 +8235,53 @@
return result;
}
@@ -10756,17 +10899,30 @@
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)
+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);
- }
+ {
+@@ -8988,12 +8292,12 @@
+ }
+ else
+ {
+- FinderDefSeq *deep_copy =
+- new FinderDefSeq (*p.ptr_);
++ IR_FinderDefSeq *deep_copy =
++ new IR_FinderDefSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- FinderDefSeq *tmp = deep_copy;
++ IR_FinderDefSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -9004,97 +8308,97 @@
return *this;
}
@@ -10888,7 +11044,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -8898,57 +8202,50 @@
+@@ -9102,57 +8406,50 @@
}
ACE_INLINE
@@ -10961,8 +11117,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -8958,200 +8255,179 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -9162,200 +8459,179 @@
+ this->IR_PrimaryKeyDef_setup_collocation (_tao_collocated);
}
-
@@ -11216,7 +11372,7 @@
{
if (buffer == 0)
return;
-@@ -9159,36 +8435,36 @@
+@@ -9363,36 +8639,36 @@
}
ACE_INLINE
@@ -11261,7 +11417,7 @@
this->buffer_ = tmp1;
}
-@@ -9198,20 +8474,20 @@
+@@ -9402,20 +8678,20 @@
}
}
@@ -11286,7 +11442,7 @@
}
if (this->maximum_ < rhs.maximum_)
{
-@@ -9224,28 +8500,28 @@
+@@ -9428,28 +8704,28 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -11325,7 +11481,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -9257,7 +8533,7 @@
+@@ -9461,7 +8737,7 @@
}
else
{
@@ -11334,7 +11490,7 @@
}
}
else // if (orphan == 1)
-@@ -9266,7 +8542,7 @@
+@@ -9470,7 +8746,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -11343,7 +11499,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -9276,160 +8552,153 @@
+@@ -9480,60 +8756,53 @@
return result;
}
@@ -11410,17 +11566,30 @@
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)
+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);
- }
+ {
+@@ -9544,12 +8813,12 @@
+ }
+ else
+ {
+- ContainedSeq *deep_copy =
+- new ContainedSeq (*p.ptr_);
++ IR_ContainedSeq *deep_copy =
++ new IR_ContainedSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- ContainedSeq *tmp = deep_copy;
++ IR_ContainedSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -9560,97 +8829,97 @@
return *this;
}
@@ -11542,7 +11711,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -9437,184 +8706,181 @@
+@@ -9658,90 +8927,87 @@
}
ACE_INLINE
@@ -11656,11 +11825,24 @@
+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);
- }
+ {
+@@ -9752,12 +9018,12 @@
+ }
+ else
+ {
+- StructMember *deep_copy =
+- new StructMember (*p.ptr_);
++ IR_StructMember *deep_copy =
++ new IR_StructMember (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- StructMember *tmp = deep_copy;
++ IR_StructMember *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -9768,91 +9034,91 @@
return *this;
}
@@ -11774,7 +11956,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -9622,38 +8888,38 @@
+@@ -9860,38 +9126,38 @@
}
ACE_INLINE
@@ -11825,7 +12007,7 @@
{
return this->ptr_;
}
-@@ -9661,54 +8927,51 @@
+@@ -9899,54 +9165,51 @@
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
@@ -11892,7 +12074,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -9721,8 +8984,8 @@
+@@ -9959,8 +9222,8 @@
}
}
@@ -11903,7 +12085,7 @@
// Assignment operator.
{
if (this == &rhs)
-@@ -9733,7 +8996,7 @@
+@@ -9971,7 +9234,7 @@
if (this->maximum_ < rhs.maximum_)
{
// free the old buffer
@@ -11912,7 +12094,7 @@
_TAO_Unbounded_Sequence_IR_StructMemberSeq::freebuf (tmp);
this->buffer_ = _TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (rhs.maximum_);
}
-@@ -9743,8 +9006,8 @@
+@@ -9981,8 +9244,8 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -11923,7 +12105,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -9753,30 +9016,30 @@
+@@ -9991,30 +9254,30 @@
}
// = Accessors.
@@ -11963,7 +12145,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -9788,7 +9051,7 @@
+@@ -10026,7 +9289,7 @@
}
else
{
@@ -11972,7 +12154,7 @@
}
}
else // if (orphan == 1)
-@@ -9797,7 +9060,7 @@
+@@ -10035,7 +9298,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -11981,7 +12163,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -9807,182 +9070,176 @@
+@@ -10045,76 +9308,70 @@
return result;
}
@@ -12067,17 +12249,30 @@
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)
+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);
- }
+ {
+@@ -10125,12 +9382,12 @@
+ }
+ else
+ {
+- StructMemberSeq *deep_copy =
+- new StructMemberSeq (*p.ptr_);
++ IR_StructMemberSeq *deep_copy =
++ new IR_StructMemberSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- StructMemberSeq *tmp = deep_copy;
++ IR_StructMemberSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -10141,103 +9398,103 @@
return *this;
}
@@ -12208,7 +12403,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -9990,184 +9247,181 @@
+@@ -10245,90 +9502,87 @@
}
ACE_INLINE
@@ -12322,11 +12517,24 @@
+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);
- }
+ {
+@@ -10339,12 +9593,12 @@
+ }
+ else
+ {
+- Initializer *deep_copy =
+- new Initializer (*p.ptr_);
++ IR_Initializer *deep_copy =
++ new IR_Initializer (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- Initializer *tmp = deep_copy;
++ IR_Initializer *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -10355,91 +9609,91 @@
return *this;
}
@@ -12440,7 +12648,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -10175,93 +9429,89 @@
+@@ -10447,93 +9701,89 @@
}
ACE_INLINE
@@ -12558,7 +12766,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -10274,8 +9524,8 @@
+@@ -10546,8 +9796,8 @@
}
}
@@ -12569,7 +12777,7 @@
// Assignment operator.
{
if (this == &rhs)
-@@ -10286,7 +9536,7 @@
+@@ -10558,7 +9808,7 @@
if (this->maximum_ < rhs.maximum_)
{
// free the old buffer
@@ -12578,7 +12786,7 @@
_TAO_Unbounded_Sequence_IR_InitializerSeq::freebuf (tmp);
this->buffer_ = _TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (rhs.maximum_);
}
-@@ -10296,8 +9546,8 @@
+@@ -10568,8 +9818,8 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -12589,7 +12797,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -10306,30 +9556,30 @@
+@@ -10578,30 +9828,30 @@
}
// = Accessors.
@@ -12629,7 +12837,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -10341,7 +9591,7 @@
+@@ -10613,7 +9863,7 @@
}
else
{
@@ -12638,7 +12846,7 @@
}
}
else // if (orphan == 1)
-@@ -10350,7 +9600,7 @@
+@@ -10622,7 +9872,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -12647,7 +12855,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -10360,182 +9610,176 @@
+@@ -10632,76 +9882,70 @@
return result;
}
@@ -12733,17 +12941,30 @@
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)
+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);
- }
+ {
+@@ -10712,12 +9956,12 @@
+ }
+ else
+ {
+- InitializerSeq *deep_copy =
+- new InitializerSeq (*p.ptr_);
++ IR_InitializerSeq *deep_copy =
++ new IR_InitializerSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- InitializerSeq *tmp = deep_copy;
++ IR_InitializerSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -10728,103 +9972,103 @@
return *this;
}
@@ -12874,7 +13095,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -10543,184 +9787,181 @@
+@@ -10832,90 +10076,87 @@
}
ACE_INLINE
@@ -12988,11 +13209,24 @@
+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);
- }
+ {
+@@ -10926,12 +10167,12 @@
+ }
+ else
+ {
+- UnionMember *deep_copy =
+- new UnionMember (*p.ptr_);
++ IR_UnionMember *deep_copy =
++ new IR_UnionMember (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- UnionMember *tmp = deep_copy;
++ IR_UnionMember *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -10942,91 +10183,91 @@
return *this;
}
@@ -13106,7 +13340,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -10728,93 +9969,89 @@
+@@ -11034,93 +10275,89 @@
}
ACE_INLINE
@@ -13224,7 +13458,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -10827,8 +10064,8 @@
+@@ -11133,8 +10370,8 @@
}
}
@@ -13235,7 +13469,7 @@
// Assignment operator.
{
if (this == &rhs)
-@@ -10839,7 +10076,7 @@
+@@ -11145,7 +10382,7 @@
if (this->maximum_ < rhs.maximum_)
{
// free the old buffer
@@ -13244,7 +13478,7 @@
_TAO_Unbounded_Sequence_IR_UnionMemberSeq::freebuf (tmp);
this->buffer_ = _TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (rhs.maximum_);
}
-@@ -10849,8 +10086,8 @@
+@@ -11155,8 +10392,8 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -13255,7 +13489,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -10859,30 +10096,30 @@
+@@ -11165,30 +10402,30 @@
}
// = Accessors.
@@ -13295,7 +13529,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -10894,7 +10131,7 @@
+@@ -11200,7 +10437,7 @@
}
else
{
@@ -13304,7 +13538,7 @@
}
}
else // if (orphan == 1)
-@@ -10903,7 +10140,7 @@
+@@ -11209,7 +10446,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -13313,7 +13547,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -10913,182 +10150,176 @@
+@@ -11219,76 +10456,70 @@
return result;
}
@@ -13399,17 +13633,30 @@
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)
+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);
- }
+ {
+@@ -11299,12 +10530,12 @@
+ }
+ else
+ {
+- UnionMemberSeq *deep_copy =
+- new UnionMemberSeq (*p.ptr_);
++ IR_UnionMemberSeq *deep_copy =
++ new IR_UnionMemberSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- UnionMemberSeq *tmp = deep_copy;
++ IR_UnionMemberSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -11315,103 +10546,103 @@
return *this;
}
@@ -13540,7 +13787,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -11096,194 +10327,187 @@
+@@ -11419,94 +10650,87 @@
}
ACE_INLINE
@@ -13652,17 +13899,30 @@
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)
+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);
- }
+ {
+@@ -11517,12 +10741,12 @@
+ }
+ else
+ {
+- EnumMemberSeq *deep_copy =
+- new EnumMemberSeq (*p.ptr_);
++ IR_EnumMemberSeq *deep_copy =
++ new IR_EnumMemberSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- EnumMemberSeq *tmp = deep_copy;
++ IR_EnumMemberSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -11533,97 +10757,97 @@
return *this;
}
@@ -13783,7 +14043,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -11291,184 +10515,181 @@
+@@ -11631,90 +10855,87 @@
}
ACE_INLINE
@@ -13896,11 +14156,24 @@
+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);
- }
+ {
+@@ -11725,12 +10946,12 @@
+ }
+ else
+ {
+- Description *deep_copy =
+- new Description (*p.ptr_);
++ IR_Container::Description *deep_copy =
++ new IR_Container::Description (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- Description *tmp = deep_copy;
++ IR_Container::Description *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -11741,91 +10962,91 @@
return *this;
}
@@ -14014,7 +14287,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -11476,93 +10697,89 @@
+@@ -11833,93 +11054,89 @@
}
ACE_INLINE
@@ -14130,7 +14403,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -11575,8 +10792,8 @@
+@@ -11932,8 +11149,8 @@
}
}
@@ -14141,7 +14414,7 @@
// Assignment operator.
{
if (this == &rhs)
-@@ -11587,7 +10804,7 @@
+@@ -11944,7 +11161,7 @@
if (this->maximum_ < rhs.maximum_)
{
// free the old buffer
@@ -14150,7 +14423,7 @@
_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::freebuf (tmp);
this->buffer_ = _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (rhs.maximum_);
}
-@@ -11597,8 +10814,8 @@
+@@ -11954,8 +11171,8 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -14161,7 +14434,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -11607,30 +10824,30 @@
+@@ -11964,30 +11181,30 @@
}
// = Accessors.
@@ -14201,7 +14474,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -11642,7 +10859,7 @@
+@@ -11999,7 +11216,7 @@
}
else
{
@@ -14210,7 +14483,7 @@
}
}
else // if (orphan == 1)
-@@ -11651,7 +10868,7 @@
+@@ -12008,7 +11225,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -14219,7 +14492,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -11661,182 +10878,176 @@
+@@ -12018,76 +11235,70 @@
return result;
}
@@ -14305,17 +14578,30 @@
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)
+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);
- }
+ {
+@@ -12098,12 +11309,12 @@
+ }
+ else
+ {
+- DescriptionSeq *deep_copy =
+- new DescriptionSeq (*p.ptr_);
++ IR_Container::DescriptionSeq *deep_copy =
++ new IR_Container::DescriptionSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- DescriptionSeq *tmp = deep_copy;
++ IR_Container::DescriptionSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -12114,103 +11325,103 @@
return *this;
}
@@ -14446,7 +14732,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -11844,57 +11055,50 @@
+@@ -12218,57 +11429,50 @@
}
ACE_INLINE
@@ -14517,8 +14803,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -11904,185 +11108,164 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -12278,185 +11482,164 @@
+ this->IR_PrimitiveDef_setup_collocation (_tao_collocated);
}
-
@@ -14752,8 +15038,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -12092,185 +11275,164 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -12466,185 +11649,164 @@
+ this->IR_StringDef_setup_collocation (_tao_collocated);
}
-
@@ -14987,8 +15273,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -12280,185 +11442,164 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -12654,185 +11816,164 @@
+ this->IR_SequenceDef_setup_collocation (_tao_collocated);
}
-
@@ -15222,8 +15508,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -12468,185 +11609,164 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -12842,185 +11983,164 @@
+ this->IR_ArrayDef_setup_collocation (_tao_collocated);
}
-
@@ -15457,8 +15743,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -12656,185 +11776,164 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -13030,185 +12150,164 @@
+ this->IR_WstringDef_setup_collocation (_tao_collocated);
}
-
@@ -15692,8 +15978,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -12844,185 +11943,164 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -13218,185 +12317,164 @@
+ this->IR_FixedDef_setup_collocation (_tao_collocated);
}
-
@@ -15927,8 +16213,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -13032,311 +12110,295 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -13406,217 +12484,201 @@
+ this->IR_ComponentRepository_setup_collocation (_tao_collocated);
}
-#endif /* end #if !defined */
@@ -16202,11 +16488,24 @@
+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);
- }
+ {
+@@ -13627,12 +12689,12 @@
+ }
+ else
+ {
+- ModuleDescription *deep_copy =
+- new ModuleDescription (*p.ptr_);
++ IR_ModuleDescription *deep_copy =
++ new IR_ModuleDescription (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- ModuleDescription *tmp = deep_copy;
++ IR_ModuleDescription *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -13643,91 +12705,91 @@
return *this;
}
@@ -16320,7 +16619,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -13344,175 +12406,175 @@
+@@ -13735,81 +12797,81 @@
}
ACE_INLINE
@@ -16423,11 +16722,24 @@
+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);
- }
+ {
+@@ -13820,12 +12882,12 @@
+ }
+ else
+ {
+- ConstantDescription *deep_copy =
+- new ConstantDescription (*p.ptr_);
++ IR_ConstantDescription *deep_copy =
++ new IR_ConstantDescription (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- ConstantDescription *tmp = deep_copy;
++ IR_ConstantDescription *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -13836,91 +12898,91 @@
return *this;
}
@@ -16541,7 +16853,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -13520,48 +12582,44 @@
+@@ -13928,48 +12990,44 @@
}
ACE_INLINE
@@ -16603,8 +16915,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -13571,311 +12629,295 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -13979,217 +13037,201 @@
+ this->IR_TypedefDef_setup_collocation (_tao_collocated);
}
-#endif /* end #if !defined */
@@ -16878,11 +17190,24 @@
+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);
- }
+ {
+@@ -14200,12 +13242,12 @@
+ }
+ else
+ {
+- TypeDescription *deep_copy =
+- new TypeDescription (*p.ptr_);
++ IR_TypeDescription *deep_copy =
++ new IR_TypeDescription (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- TypeDescription *tmp = deep_copy;
++ IR_TypeDescription *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -14216,91 +13258,91 @@
return *this;
}
@@ -16996,7 +17321,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -13883,175 +12925,175 @@
+@@ -14308,81 +13350,81 @@
}
ACE_INLINE
@@ -17099,11 +17424,24 @@
+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);
- }
+ {
+@@ -14393,12 +13435,12 @@
+ }
+ else
+ {
+- ExceptionDescription *deep_copy =
+- new ExceptionDescription (*p.ptr_);
++ IR_ExceptionDescription *deep_copy =
++ new IR_ExceptionDescription (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- ExceptionDescription *tmp = deep_copy;
++ IR_ExceptionDescription *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -14409,91 +13451,91 @@
return *this;
}
@@ -17217,7 +17555,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -14059,63 +13101,59 @@
+@@ -14501,63 +13543,59 @@
}
ACE_INLINE
@@ -17299,7 +17637,7 @@
{
if (buffer == 0)
return;
-@@ -14123,36 +13161,36 @@
+@@ -14565,36 +13603,36 @@
}
ACE_INLINE
@@ -17344,7 +17682,7 @@
this->buffer_ = tmp1;
}
-@@ -14162,20 +13200,20 @@
+@@ -14604,20 +13642,20 @@
}
}
@@ -17369,7 +17707,7 @@
}
if (this->maximum_ < rhs.maximum_)
{
-@@ -14188,28 +13226,28 @@
+@@ -14630,28 +13668,28 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -17408,7 +17746,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -14221,7 +13259,7 @@
+@@ -14663,7 +13701,7 @@
}
else
{
@@ -17417,7 +17755,7 @@
}
}
else // if (orphan == 1)
-@@ -14230,7 +13268,7 @@
+@@ -14672,7 +13710,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -17426,7 +17764,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -14240,160 +13278,153 @@
+@@ -14682,60 +13720,53 @@
return result;
}
@@ -17493,17 +17831,30 @@
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)
+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);
- }
+ {
+@@ -14746,12 +13777,12 @@
+ }
+ else
+ {
+- ExceptionDefSeq *deep_copy =
+- new ExceptionDefSeq (*p.ptr_);
++ IR_ExceptionDefSeq *deep_copy =
++ new IR_ExceptionDefSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- ExceptionDefSeq *tmp = deep_copy;
++ IR_ExceptionDefSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -14762,97 +13793,97 @@
return *this;
}
@@ -17625,7 +17976,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -14401,102 +13432,95 @@
+@@ -14860,102 +13891,95 @@
}
ACE_INLINE
@@ -17754,7 +18105,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -14509,8 +13533,8 @@
+@@ -14968,8 +13992,8 @@
}
}
@@ -17765,7 +18116,7 @@
// Assignment operator.
{
if (this == &rhs)
-@@ -14521,7 +13545,7 @@
+@@ -14980,7 +14004,7 @@
if (this->maximum_ < rhs.maximum_)
{
// free the old buffer
@@ -17774,7 +18125,7 @@
_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::freebuf (tmp);
this->buffer_ = _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (rhs.maximum_);
}
-@@ -14531,8 +13555,8 @@
+@@ -14990,8 +14014,8 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -17785,7 +18136,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -14541,30 +13565,30 @@
+@@ -15000,30 +14024,30 @@
}
// = Accessors.
@@ -17825,7 +18176,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -14576,7 +13600,7 @@
+@@ -15035,7 +14059,7 @@
}
else
{
@@ -17834,7 +18185,7 @@
}
}
else // if (orphan == 1)
-@@ -14585,7 +13609,7 @@
+@@ -15044,7 +14068,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -17843,7 +18194,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -14595,182 +13619,176 @@
+@@ -15054,76 +14078,70 @@
return result;
}
@@ -17929,17 +18280,30 @@
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)
+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);
- }
+ {
+@@ -15134,12 +14152,12 @@
+ }
+ else
+ {
+- ExcDescriptionSeq *deep_copy =
+- new ExcDescriptionSeq (*p.ptr_);
++ IR_ExcDescriptionSeq *deep_copy =
++ new IR_ExcDescriptionSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- ExcDescriptionSeq *tmp = deep_copy;
++ IR_ExcDescriptionSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -15150,103 +14168,103 @@
return *this;
}
@@ -18070,7 +18434,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -14778,57 +13796,50 @@
+@@ -15254,57 +14272,50 @@
}
ACE_INLINE
@@ -18143,8 +18507,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -14838,311 +13849,295 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -15314,217 +14325,201 @@
+ this->IR_AttributeDef_setup_collocation (_tao_collocated);
}
-#endif /* end #if !defined */
@@ -18418,11 +18782,24 @@
+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);
- }
+ {
+@@ -15535,12 +14530,12 @@
+ }
+ else
+ {
+- AttributeDescription *deep_copy =
+- new AttributeDescription (*p.ptr_);
++ IR_AttributeDescription *deep_copy =
++ new IR_AttributeDescription (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- AttributeDescription *tmp = deep_copy;
++ IR_AttributeDescription *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -15551,91 +14546,91 @@
return *this;
}
@@ -18536,7 +18913,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -15150,175 +14145,175 @@
+@@ -15643,81 +14638,81 @@
}
ACE_INLINE
@@ -18639,11 +19016,24 @@
+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);
- }
+ {
+@@ -15728,12 +14723,12 @@
+ }
+ else
+ {
+- ParameterDescription *deep_copy =
+- new ParameterDescription (*p.ptr_);
++ IR_ParameterDescription *deep_copy =
++ new IR_ParameterDescription (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- ParameterDescription *tmp = deep_copy;
++ IR_ParameterDescription *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -15744,91 +14739,91 @@
return *this;
}
@@ -18757,7 +19147,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -15326,93 +14321,89 @@
+@@ -15836,93 +14831,89 @@
}
ACE_INLINE
@@ -18875,7 +19265,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -15425,8 +14416,8 @@
+@@ -15935,8 +14926,8 @@
}
}
@@ -18886,7 +19276,7 @@
// Assignment operator.
{
if (this == &rhs)
-@@ -15437,7 +14428,7 @@
+@@ -15947,7 +14938,7 @@
if (this->maximum_ < rhs.maximum_)
{
// free the old buffer
@@ -18895,7 +19285,7 @@
_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::freebuf (tmp);
this->buffer_ = _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (rhs.maximum_);
}
-@@ -15447,8 +14438,8 @@
+@@ -15957,8 +14948,8 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -18906,7 +19296,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -15457,30 +14448,30 @@
+@@ -15967,30 +14958,30 @@
}
// = Accessors.
@@ -18946,7 +19336,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -15492,7 +14483,7 @@
+@@ -16002,7 +14993,7 @@
}
else
{
@@ -18955,7 +19345,7 @@
}
}
else // if (orphan == 1)
-@@ -15501,7 +14492,7 @@
+@@ -16011,7 +15002,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -18964,7 +19354,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -15511,182 +14502,176 @@
+@@ -16021,76 +15012,70 @@
return result;
}
@@ -19050,17 +19440,30 @@
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)
+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);
- }
+ {
+@@ -16101,12 +15086,12 @@
+ }
+ else
+ {
+- ParDescriptionSeq *deep_copy =
+- new ParDescriptionSeq (*p.ptr_);
++ IR_ParDescriptionSeq *deep_copy =
++ new IR_ParDescriptionSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- ParDescriptionSeq *tmp = deep_copy;
++ IR_ParDescriptionSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -16117,103 +15102,103 @@
return *this;
}
@@ -19191,7 +19594,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -15694,194 +14679,187 @@
+@@ -16221,94 +15206,87 @@
}
ACE_INLINE
@@ -19303,17 +19706,30 @@
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)
+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);
- }
+ {
+@@ -16319,12 +15297,12 @@
+ }
+ else
+ {
+- ContextIdSeq *deep_copy =
+- new ContextIdSeq (*p.ptr_);
++ IR_ContextIdSeq *deep_copy =
++ new IR_ContextIdSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- ContextIdSeq *tmp = deep_copy;
++ IR_ContextIdSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -16335,97 +15313,97 @@
return *this;
}
@@ -19434,7 +19850,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -15889,57 +14867,50 @@
+@@ -16433,57 +15411,50 @@
}
ACE_INLINE
@@ -19506,8 +19922,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -15949,311 +14920,295 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -16493,217 +15464,201 @@
+ this->IR_OperationDef_setup_collocation (_tao_collocated);
}
-#endif /* end #if !defined */
@@ -19781,11 +20197,24 @@
+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);
- }
+ {
+@@ -16714,12 +15669,12 @@
+ }
+ else
+ {
+- OperationDescription *deep_copy =
+- new OperationDescription (*p.ptr_);
++ IR_OperationDescription *deep_copy =
++ new IR_OperationDescription (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- OperationDescription *tmp = deep_copy;
++ IR_OperationDescription *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -16730,91 +15685,91 @@
return *this;
}
@@ -19899,7 +20328,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -16261,185 +15216,181 @@
+@@ -16822,85 +15777,81 @@
}
ACE_INLINE
@@ -20000,17 +20429,30 @@
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)
+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);
- }
+ {
+@@ -16911,12 +15862,12 @@
+ }
+ else
+ {
+- RepositoryIdSeq *deep_copy =
+- new RepositoryIdSeq (*p.ptr_);
++ IR_RepositoryIdSeq *deep_copy =
++ new IR_RepositoryIdSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- RepositoryIdSeq *tmp = deep_copy;
++ IR_RepositoryIdSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -16927,97 +15878,97 @@
return *this;
}
@@ -20131,7 +20573,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -16447,102 +15398,95 @@
+@@ -17025,102 +15976,95 @@
}
ACE_INLINE
@@ -20259,7 +20701,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -16555,8 +15499,8 @@
+@@ -17133,8 +16077,8 @@
}
}
@@ -20270,7 +20712,7 @@
// Assignment operator.
{
if (this == &rhs)
-@@ -16567,7 +15511,7 @@
+@@ -17145,7 +16089,7 @@
if (this->maximum_ < rhs.maximum_)
{
// free the old buffer
@@ -20279,7 +20721,7 @@
_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::freebuf (tmp);
this->buffer_ = _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (rhs.maximum_);
}
-@@ -16577,8 +15521,8 @@
+@@ -17155,8 +16099,8 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -20290,7 +20732,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -16587,30 +15531,30 @@
+@@ -17165,30 +16109,30 @@
}
// = Accessors.
@@ -20330,7 +20772,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -16622,7 +15566,7 @@
+@@ -17200,7 +16144,7 @@
}
else
{
@@ -20339,7 +20781,7 @@
}
}
else // if (orphan == 1)
-@@ -16631,7 +15575,7 @@
+@@ -17209,7 +16153,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -20348,7 +20790,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -16641,182 +15585,176 @@
+@@ -17219,76 +16163,70 @@
return result;
}
@@ -20434,17 +20876,30 @@
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)
+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);
- }
+ {
+@@ -17299,12 +16237,12 @@
+ }
+ else
+ {
+- OpDescriptionSeq *deep_copy =
+- new OpDescriptionSeq (*p.ptr_);
++ IR_OpDescriptionSeq *deep_copy =
++ new IR_OpDescriptionSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- OpDescriptionSeq *tmp = deep_copy;
++ IR_OpDescriptionSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -17315,103 +16253,103 @@
return *this;
}
@@ -20575,7 +21030,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -16824,102 +15762,95 @@
+@@ -17419,102 +16357,95 @@
}
ACE_INLINE
@@ -20704,7 +21159,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -16932,8 +15863,8 @@
+@@ -17527,8 +16458,8 @@
}
}
@@ -20715,7 +21170,7 @@
// Assignment operator.
{
if (this == &rhs)
-@@ -16944,7 +15875,7 @@
+@@ -17539,7 +16470,7 @@
if (this->maximum_ < rhs.maximum_)
{
// free the old buffer
@@ -20724,7 +21179,7 @@
_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::freebuf (tmp);
this->buffer_ = _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (rhs.maximum_);
}
-@@ -16954,8 +15885,8 @@
+@@ -17549,8 +16480,8 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -20735,7 +21190,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -16964,30 +15895,30 @@
+@@ -17559,30 +16490,30 @@
}
// = Accessors.
@@ -20775,7 +21230,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -16999,7 +15930,7 @@
+@@ -17594,7 +16525,7 @@
}
else
{
@@ -20784,7 +21239,7 @@
}
}
else // if (orphan == 1)
-@@ -17008,7 +15939,7 @@
+@@ -17603,7 +16534,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -20793,7 +21248,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -17018,182 +15949,176 @@
+@@ -17613,76 +16544,70 @@
return result;
}
@@ -20879,17 +21334,30 @@
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)
+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);
- }
+ {
+@@ -17693,12 +16618,12 @@
+ }
+ else
+ {
+- AttrDescriptionSeq *deep_copy =
+- new AttrDescriptionSeq (*p.ptr_);
++ IR_AttrDescriptionSeq *deep_copy =
++ new IR_AttrDescriptionSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- AttrDescriptionSeq *tmp = deep_copy;
++ IR_AttrDescriptionSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -17709,103 +16634,103 @@
return *this;
}
@@ -21020,7 +21488,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -17201,184 +16126,181 @@
+@@ -17813,90 +16738,87 @@
}
ACE_INLINE
@@ -21134,11 +21602,24 @@
+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);
- }
+ {
+@@ -17907,12 +16829,12 @@
+ }
+ else
+ {
+- InterfaceDescription *deep_copy =
+- new InterfaceDescription (*p.ptr_);
++ IR_InterfaceDescription *deep_copy =
++ new IR_InterfaceDescription (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- InterfaceDescription *tmp = deep_copy;
++ IR_InterfaceDescription *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -17923,91 +16845,91 @@
return *this;
}
@@ -21252,7 +21733,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -17386,175 +16308,175 @@
+@@ -18015,81 +16937,81 @@
}
ACE_INLINE
@@ -21355,11 +21836,24 @@
+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);
- }
+ {
+@@ -18100,12 +17022,12 @@
+ }
+ else
+ {
+- ValueMember *deep_copy =
+- new ValueMember (*p.ptr_);
++ IR_ValueMember *deep_copy =
++ new IR_ValueMember (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- ValueMember *tmp = deep_copy;
++ IR_ValueMember *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -18116,91 +17038,91 @@
return *this;
}
@@ -21473,7 +21967,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -17562,93 +16484,89 @@
+@@ -18208,93 +17130,89 @@
}
ACE_INLINE
@@ -21591,7 +22085,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -17661,8 +16579,8 @@
+@@ -18307,8 +17225,8 @@
}
}
@@ -21602,7 +22096,7 @@
// Assignment operator.
{
if (this == &rhs)
-@@ -17673,7 +16591,7 @@
+@@ -18319,7 +17237,7 @@
if (this->maximum_ < rhs.maximum_)
{
// free the old buffer
@@ -21611,7 +22105,7 @@
_TAO_Unbounded_Sequence_IR_ValueMemberSeq::freebuf (tmp);
this->buffer_ = _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (rhs.maximum_);
}
-@@ -17683,8 +16601,8 @@
+@@ -18329,8 +17247,8 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -21622,7 +22116,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -17693,30 +16611,30 @@
+@@ -18339,30 +17257,30 @@
}
// = Accessors.
@@ -21662,7 +22156,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -17728,7 +16646,7 @@
+@@ -18374,7 +17292,7 @@
}
else
{
@@ -21671,7 +22165,7 @@
}
}
else // if (orphan == 1)
-@@ -17737,7 +16655,7 @@
+@@ -18383,7 +17301,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -21680,7 +22174,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -17747,182 +16665,176 @@
+@@ -18393,76 +17311,70 @@
return result;
}
@@ -21766,17 +22260,30 @@
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)
+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);
- }
+ {
+@@ -18473,12 +17385,12 @@
+ }
+ else
+ {
+- ValueMemberSeq *deep_copy =
+- new ValueMemberSeq (*p.ptr_);
++ IR_ValueMemberSeq *deep_copy =
++ new IR_ValueMemberSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- ValueMemberSeq *tmp = deep_copy;
++ IR_ValueMemberSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -18489,103 +17401,103 @@
return *this;
}
@@ -21907,7 +22414,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -17930,57 +16842,50 @@
+@@ -18593,57 +17505,50 @@
}
ACE_INLINE
@@ -21980,8 +22487,8 @@
TAO_Stub *objref,
CORBA::Boolean _tao_collocated,
TAO_Abstract_ServantBase *servant
-@@ -17990,311 +16895,295 @@
- this->_tao_setup_collocation (_tao_collocated);
+@@ -18653,217 +17558,201 @@
+ this->IR_ValueMemberDef_setup_collocation (_tao_collocated);
}
-#endif /* end #if !defined */
@@ -22255,11 +22762,24 @@
+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);
- }
+ {
+@@ -18874,12 +17763,12 @@
+ }
+ else
+ {
+- ValueDescription *deep_copy =
+- new ValueDescription (*p.ptr_);
++ IR_ValueDescription *deep_copy =
++ new IR_ValueDescription (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- ValueDescription *tmp = deep_copy;
++ IR_ValueDescription *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -18890,91 +17779,91 @@
return *this;
}
@@ -22373,7 +22893,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -18302,175 +17191,175 @@
+@@ -18982,81 +17871,81 @@
}
ACE_INLINE
@@ -22476,11 +22996,24 @@
+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);
- }
+ {
+@@ -19067,12 +17956,12 @@
+ }
+ else
+ {
+- ProvidesDescription *deep_copy =
+- new ProvidesDescription (*p.ptr_);
++ IR_ProvidesDescription *deep_copy =
++ new IR_ProvidesDescription (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- ProvidesDescription *tmp = deep_copy;
++ IR_ProvidesDescription *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -19083,91 +17972,91 @@
return *this;
}
@@ -22594,7 +23127,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -18478,175 +17367,175 @@
+@@ -19175,81 +18064,81 @@
}
ACE_INLINE
@@ -22697,11 +23230,24 @@
+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);
- }
+ {
+@@ -19260,12 +18149,12 @@
+ }
+ else
+ {
+- UsesDescription *deep_copy =
+- new UsesDescription (*p.ptr_);
++ IR_UsesDescription *deep_copy =
++ new IR_UsesDescription (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- UsesDescription *tmp = deep_copy;
++ IR_UsesDescription *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -19276,91 +18165,91 @@
return *this;
}
@@ -22815,7 +23361,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -18654,93 +17543,89 @@
+@@ -19368,93 +18257,89 @@
}
ACE_INLINE
@@ -22933,7 +23479,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -18753,8 +17638,8 @@
+@@ -19467,8 +18352,8 @@
}
}
@@ -22944,7 +23490,7 @@
// Assignment operator.
{
if (this == &rhs)
-@@ -18765,7 +17650,7 @@
+@@ -19479,7 +18364,7 @@
if (this->maximum_ < rhs.maximum_)
{
// free the old buffer
@@ -22953,7 +23499,7 @@
_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (tmp);
this->buffer_ = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (rhs.maximum_);
}
-@@ -18775,8 +17660,8 @@
+@@ -19489,8 +18374,8 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -22964,7 +23510,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -18785,30 +17670,30 @@
+@@ -19499,30 +18384,30 @@
}
// = Accessors.
@@ -23004,7 +23550,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -18820,7 +17705,7 @@
+@@ -19534,7 +18419,7 @@
}
else
{
@@ -23013,7 +23559,7 @@
}
}
else // if (orphan == 1)
-@@ -18829,7 +17714,7 @@
+@@ -19543,7 +18428,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -23022,7 +23568,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -18839,182 +17724,176 @@
+@@ -19553,76 +18438,70 @@
return result;
}
@@ -23108,17 +23654,30 @@
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)
+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);
- }
+ {
+@@ -19633,12 +18512,12 @@
+ }
+ else
+ {
+- ProvidesDescSeq *deep_copy =
+- new ProvidesDescSeq (*p.ptr_);
++ IR_ProvidesDescSeq *deep_copy =
++ new IR_ProvidesDescSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- ProvidesDescSeq *tmp = deep_copy;
++ IR_ProvidesDescSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -19649,103 +18528,103 @@
return *this;
}
@@ -23249,7 +23808,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -19022,102 +17901,95 @@
+@@ -19753,102 +18632,95 @@
}
ACE_INLINE
@@ -23378,7 +23937,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -19130,8 +18002,8 @@
+@@ -19861,8 +18733,8 @@
}
}
@@ -23389,7 +23948,7 @@
// Assignment operator.
{
if (this == &rhs)
-@@ -19142,7 +18014,7 @@
+@@ -19873,7 +18745,7 @@
if (this->maximum_ < rhs.maximum_)
{
// free the old buffer
@@ -23398,7 +23957,7 @@
_TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (tmp);
this->buffer_ = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (rhs.maximum_);
}
-@@ -19152,8 +18024,8 @@
+@@ -19883,8 +18755,8 @@
TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -23409,7 +23968,7 @@
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-@@ -19162,30 +18034,30 @@
+@@ -19893,30 +18765,30 @@
}
// = Accessors.
@@ -23449,7 +24008,7 @@
if (orphan == 0)
{
// We retain ownership.
-@@ -19197,7 +18069,7 @@
+@@ -19928,7 +18800,7 @@
}
else
{
@@ -23458,7 +24017,7 @@
}
}
else // if (orphan == 1)
-@@ -19206,7 +18078,7 @@
+@@ -19937,7 +18809,7 @@
{
// We set the state back to default and relinquish
// ownership.
@@ -23467,7 +24026,7 @@
this->maximum_ = 0;
this->length_ = 0;
this->buffer_ = 0;
-@@ -19216,182 +18088,176 @@
+@@ -19947,76 +18819,70 @@
return result;
}
@@ -23553,17 +24112,30 @@
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)
+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);
- }
+ {
+@@ -20027,12 +18893,12 @@
+ }
+ else
+ {
+- UsesDescSeq *deep_copy =
+- new UsesDescSeq (*p.ptr_);
++ IR_UsesDescSeq *deep_copy =
++ new IR_UsesDescSeq (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- UsesDescSeq *tmp = deep_copy;
++ IR_UsesDescSeq *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -20043,103 +18909,103 @@
return *this;
}
@@ -23694,7 +24266,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -19399,184 +18265,181 @@
+@@ -20147,90 +19013,87 @@
}
ACE_INLINE
@@ -23808,11 +24380,24 @@
+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);
- }
+ {
+@@ -20241,12 +19104,12 @@
+ }
+ else
+ {
+- EventDescription *deep_copy =
+- new EventDescription (*p.ptr_);
++ IR_EventDescription *deep_copy =
++ new IR_EventDescription (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- EventDescription *tmp = deep_copy;
++ IR_EventDescription *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -20257,91 +19120,91 @@
return *this;
}
@@ -23926,7 +24511,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -19584,175 +18447,175 @@
+@@ -20349,81 +19212,81 @@
}
ACE_INLINE
@@ -24029,11 +24614,24 @@
+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);
- }
+ {
+@@ -20434,12 +19297,12 @@
+ }
+ else
+ {
+- ComponentDescription *deep_copy =
+- new ComponentDescription (*p.ptr_);
++ IR_ComponentDescription *deep_copy =
++ new IR_ComponentDescription (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- ComponentDescription *tmp = deep_copy;
++ IR_ComponentDescription *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -20450,91 +19313,91 @@
return *this;
}
@@ -24147,7 +24745,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -19760,175 +18623,175 @@
+@@ -20542,81 +19405,81 @@
}
ACE_INLINE
@@ -24250,11 +24848,24 @@
+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);
- }
+ {
+@@ -20627,12 +19490,12 @@
+ }
+ else
+ {
+- PrimaryKeyDescription *deep_copy =
+- new PrimaryKeyDescription (*p.ptr_);
++ IR_PrimaryKeyDescription *deep_copy =
++ new IR_PrimaryKeyDescription (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- PrimaryKeyDescription *tmp = deep_copy;
++ IR_PrimaryKeyDescription *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -20643,91 +19506,91 @@
return *this;
}
@@ -24368,7 +24979,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -19936,175 +18799,175 @@
+@@ -20735,81 +19598,81 @@
}
ACE_INLINE
@@ -24471,11 +25082,24 @@
+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);
- }
+ {
+@@ -20820,12 +19683,12 @@
+ }
+ else
+ {
+- HomeDescription *deep_copy =
+- new HomeDescription (*p.ptr_);
++ IR_HomeDescription *deep_copy =
++ new IR_HomeDescription (*p.ptr_);
+
+ if (deep_copy != 0)
+ {
+- HomeDescription *tmp = deep_copy;
++ IR_HomeDescription *tmp = deep_copy;
+ deep_copy = this->ptr_;
+ this->ptr_ = tmp;
+ delete deep_copy;
+@@ -20836,91 +19699,91 @@
return *this;
}
@@ -24589,7 +25213,7 @@
: ptr_ (p.out ())
{
delete this->ptr_;
-@@ -20112,56 +18975,56 @@
+@@ -20928,56 +19791,56 @@
}
ACE_INLINE
@@ -24661,7 +25285,7 @@
}
return _tao_result;
-@@ -20169,19 +19032,8 @@
+@@ -20985,19 +19848,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -24682,7 +25306,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -20191,7 +19043,7 @@
+@@ -21007,7 +19859,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -24691,7 +25315,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -20201,7 +19053,7 @@
+@@ -21017,7 +19869,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -24700,7 +25324,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -20216,48 +19068,7 @@
+@@ -21032,48 +19884,7 @@
return 0;
}
@@ -24750,7 +25374,7 @@
{
if (
(strm << _tao_aggregate.kind) &&
-@@ -20269,7 +19080,7 @@
+@@ -21085,7 +19896,7 @@
}
@@ -24759,7 +25383,7 @@
{
if (
(strm >> _tao_aggregate.kind) &&
-@@ -20284,7 +19095,7 @@
+@@ -21100,7 +19911,7 @@
ACE_INLINE CORBA::Boolean
operator<< (
TAO_OutputCDR &strm,
@@ -24768,7 +25392,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -20294,7 +19105,7 @@
+@@ -21110,7 +19921,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -24777,7 +25401,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -20304,7 +19115,7 @@
+@@ -21120,7 +19931,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -24786,7 +25410,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -20319,417 +19130,133 @@
+@@ -21135,417 +19946,133 @@
return 0;
}
@@ -25267,7 +25891,7 @@
{
if (
(strm << _tao_aggregate.name.in ()) &&
-@@ -20742,7 +19269,7 @@
+@@ -21558,7 +20085,7 @@
}
@@ -25276,7 +25900,7 @@
{
if (
(strm >> _tao_aggregate.name.out ()) &&
-@@ -20755,22 +19282,16 @@
+@@ -21571,22 +20098,16 @@
}
@@ -25302,7 +25926,7 @@
{
if (
(strm << _tao_aggregate.members) &&
-@@ -20782,7 +19303,7 @@
+@@ -21598,7 +20119,7 @@
}
@@ -25311,7 +25935,7 @@
{
if (
(strm >> _tao_aggregate.members) &&
-@@ -20794,22 +19315,16 @@
+@@ -21610,22 +20131,16 @@
}
@@ -25337,7 +25961,7 @@
{
if (
(strm << _tao_aggregate.name.in ()) &&
-@@ -20823,7 +19338,7 @@
+@@ -21639,7 +20154,7 @@
}
@@ -25346,7 +25970,7 @@
{
if (
(strm >> _tao_aggregate.name.out ()) &&
-@@ -20837,48 +19352,25 @@
+@@ -21653,48 +20168,25 @@
}
@@ -25400,7 +26024,7 @@
{
if (
(strm << _tao_aggregate.contained_object.in ()) &&
-@@ -20891,7 +19383,7 @@
+@@ -21707,7 +20199,7 @@
}
@@ -25409,7 +26033,7 @@
{
if (
(strm >> _tao_aggregate.contained_object.out ()) &&
-@@ -20904,25 +19396,19 @@
+@@ -21720,25 +20212,19 @@
}
@@ -25438,7 +26062,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -20932,7 +19418,7 @@
+@@ -21748,7 +20234,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -25447,7 +26071,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -20942,7 +19428,7 @@
+@@ -21758,7 +20244,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -25456,7 +26080,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -20959,19 +19445,8 @@
+@@ -21775,19 +20261,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -25477,7 +26101,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -20981,7 +19456,7 @@
+@@ -21797,7 +20272,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -25486,7 +26110,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -20991,7 +19466,7 @@
+@@ -21807,7 +20282,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -25495,7 +26119,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -21006,80 +19481,20 @@
+@@ -21822,80 +20297,20 @@
return 0;
}
@@ -25579,7 +26203,7 @@
}
return _tao_result;
-@@ -21087,19 +19502,8 @@
+@@ -21903,19 +20318,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -25600,7 +26224,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21109,7 +19513,7 @@
+@@ -21925,7 +20329,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -25609,7 +26233,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -21119,7 +19523,7 @@
+@@ -21935,7 +20339,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -25618,7 +26242,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -21136,19 +19540,8 @@
+@@ -21952,19 +20356,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -25639,7 +26263,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21158,7 +19551,7 @@
+@@ -21974,7 +20367,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -25648,7 +26272,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -21168,7 +19561,7 @@
+@@ -21984,7 +20377,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -25657,7 +26281,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -21185,19 +19578,8 @@
+@@ -22001,19 +20394,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -25678,7 +26302,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21207,7 +19589,7 @@
+@@ -22023,7 +20405,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -25687,7 +26311,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -21217,7 +19599,7 @@
+@@ -22033,7 +20415,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -25696,7 +26320,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -21232,7 +19614,7 @@
+@@ -22048,7 +20430,7 @@
return 0;
}
@@ -25705,7 +26329,7 @@
{
if (
(strm << _tao_aggregate.name.in ()) &&
-@@ -21246,7 +19628,7 @@
+@@ -22062,7 +20444,7 @@
}
@@ -25714,7 +26338,7 @@
{
if (
(strm >> _tao_aggregate.name.out ()) &&
-@@ -21262,19 +19644,8 @@
+@@ -22078,19 +20460,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -25735,7 +26359,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21284,7 +19655,7 @@
+@@ -22100,7 +20471,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -25744,7 +26368,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -21294,7 +19665,7 @@
+@@ -22110,7 +20481,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -25753,7 +26377,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -21309,7 +19680,7 @@
+@@ -22125,7 +20496,7 @@
return 0;
}
@@ -25762,7 +26386,7 @@
{
if (
(strm << _tao_aggregate.name.in ()) &&
-@@ -21325,7 +19696,7 @@
+@@ -22141,7 +20512,7 @@
}
@@ -25771,7 +26395,7 @@
{
if (
(strm >> _tao_aggregate.name.out ()) &&
-@@ -21343,19 +19714,8 @@
+@@ -22159,19 +20530,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -25792,7 +26416,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21365,7 +19725,7 @@
+@@ -22181,7 +20541,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -25801,7 +26425,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -21375,7 +19735,7 @@
+@@ -22191,7 +20551,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -25810,7 +26434,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -21390,7 +19750,7 @@
+@@ -22206,7 +20566,7 @@
return 0;
}
@@ -25819,7 +26443,7 @@
{
if (
(strm << _tao_aggregate.name.in ()) &&
-@@ -21405,7 +19765,7 @@
+@@ -22221,7 +20581,7 @@
}
@@ -25828,7 +26452,7 @@
{
if (
(strm >> _tao_aggregate.name.out ()) &&
-@@ -21422,19 +19782,8 @@
+@@ -22238,19 +20598,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -25849,7 +26473,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21444,7 +19793,7 @@
+@@ -22260,7 +20609,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -25858,7 +26482,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -21454,7 +19803,7 @@
+@@ -22270,7 +20619,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -25867,7 +26491,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -21471,19 +19820,8 @@
+@@ -22287,19 +20636,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -25888,7 +26512,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21493,7 +19831,7 @@
+@@ -22309,7 +20647,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -25897,7 +26521,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -21503,7 +19841,7 @@
+@@ -22319,7 +20657,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -25906,7 +26530,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -21520,19 +19858,8 @@
+@@ -22336,19 +20674,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -25927,7 +26551,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21542,7 +19869,7 @@
+@@ -22358,7 +20685,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -25936,7 +26560,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -21552,7 +19879,7 @@
+@@ -22368,7 +20695,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -25945,7 +26569,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -21565,23 +19892,12 @@
+@@ -22381,23 +20708,12 @@
}
ACE_ENDTRY;
return 0;
@@ -25971,7 +26595,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21591,7 +19907,7 @@
+@@ -22407,7 +20723,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -25980,7 +26604,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -21601,7 +19917,7 @@
+@@ -22417,7 +20733,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -25989,7 +26613,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -21618,19 +19934,8 @@
+@@ -22434,19 +20750,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -26010,7 +26634,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21640,7 +19945,7 @@
+@@ -22456,7 +20761,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -26019,7 +26643,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -21650,7 +19955,7 @@
+@@ -22466,7 +20771,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -26028,7 +26652,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -21667,19 +19972,8 @@
+@@ -22483,19 +20788,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -26049,7 +26673,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21689,7 +19983,7 @@
+@@ -22505,7 +20799,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -26058,7 +26682,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -21699,7 +19993,7 @@
+@@ -22515,7 +20809,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -26067,7 +26691,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -21716,19 +20010,8 @@
+@@ -22532,19 +20826,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -26088,7 +26712,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21738,7 +20021,7 @@
+@@ -22554,7 +20837,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -26097,7 +26721,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -21748,7 +20031,7 @@
+@@ -22564,7 +20847,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -26106,7 +26730,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -21765,19 +20048,8 @@
+@@ -22581,19 +20864,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -26127,7 +26751,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21787,7 +20059,7 @@
+@@ -22603,7 +20875,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -26136,7 +26760,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -21797,7 +20069,7 @@
+@@ -22613,7 +20885,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -26145,7 +26769,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -21814,19 +20086,8 @@
+@@ -22630,19 +20902,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -26166,7 +26790,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21836,7 +20097,7 @@
+@@ -22652,7 +20913,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -26175,7 +26799,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -21846,7 +20107,7 @@
+@@ -22662,7 +20923,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -26184,7 +26808,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -21863,19 +20124,8 @@
+@@ -22679,19 +20940,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -26205,7 +26829,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21885,7 +20135,7 @@
+@@ -22701,7 +20951,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -26214,7 +26838,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -21895,7 +20145,7 @@
+@@ -22711,7 +20961,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -26223,7 +26847,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -21912,19 +20162,8 @@
+@@ -22728,19 +20978,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -26244,7 +26868,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21934,7 +20173,7 @@
+@@ -22750,7 +20989,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -26253,7 +26877,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -21944,7 +20183,7 @@
+@@ -22760,7 +20999,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -26262,7 +26886,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -21961,19 +20200,8 @@
+@@ -22777,19 +21016,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -26283,7 +26907,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21983,7 +20211,7 @@
+@@ -22799,7 +21027,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -26292,7 +26916,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -21993,7 +20221,7 @@
+@@ -22809,7 +21037,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -26301,7 +26925,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -22008,7 +20236,7 @@
+@@ -22824,7 +21052,7 @@
return 0;
}
@@ -26310,7 +26934,7 @@
{
if (
(strm << _tao_aggregate.name.in ()) &&
-@@ -22023,7 +20251,7 @@
+@@ -22839,7 +21067,7 @@
}
@@ -26319,7 +26943,7 @@
{
if (
(strm >> _tao_aggregate.name.out ()) &&
-@@ -22038,50 +20266,38 @@
+@@ -22854,50 +21082,38 @@
}
@@ -26377,7 +27001,7 @@
}
return _tao_result;
-@@ -22089,19 +20305,8 @@
+@@ -22905,19 +21121,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -26398,7 +27022,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22111,7 +20316,7 @@
+@@ -22927,7 +21132,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -26407,7 +27031,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -22121,7 +20326,7 @@
+@@ -22937,7 +21142,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -26416,7 +27040,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -22136,7 +20341,7 @@
+@@ -22952,7 +21157,7 @@
return 0;
}
@@ -26425,7 +27049,7 @@
{
if (
(strm << _tao_aggregate.name.in ()) &&
-@@ -22154,7 +20359,7 @@
+@@ -22970,7 +21175,7 @@
}
@@ -26434,7 +27058,7 @@
{
if (
(strm >> _tao_aggregate.name.out ()) &&
-@@ -22172,45 +20377,45 @@
+@@ -22988,45 +21193,45 @@
}
@@ -26487,7 +27111,7 @@
{
if (
(strm << _tao_aggregate.name.in ()) &&
-@@ -22224,7 +20429,7 @@
+@@ -23040,7 +21245,7 @@
}
@@ -26496,7 +27120,7 @@
{
if (
(strm >> _tao_aggregate.name.out ()) &&
-@@ -22238,51 +20443,28 @@
+@@ -23054,51 +21259,28 @@
}
@@ -26553,7 +27177,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22292,7 +20474,7 @@
+@@ -23108,7 +21290,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -26562,7 +27186,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -22302,7 +20484,7 @@
+@@ -23118,7 +21300,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -26571,7 +27195,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -22317,7 +20499,7 @@
+@@ -23133,7 +21315,7 @@
return 0;
}
@@ -26580,7 +27204,7 @@
{
if (
(strm << _tao_aggregate.name.in ()) &&
-@@ -22336,7 +20518,7 @@
+@@ -23152,7 +21334,7 @@
}
@@ -26589,7 +27213,7 @@
{
if (
(strm >> _tao_aggregate.name.out ()) &&
-@@ -22355,66 +20537,37 @@
+@@ -23171,66 +21353,37 @@
}
@@ -26663,7 +27287,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22424,7 +20577,7 @@
+@@ -23240,7 +21393,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -26672,7 +27296,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -22434,7 +20587,7 @@
+@@ -23250,7 +21403,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -26681,7 +27305,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -22449,7 +20602,7 @@
+@@ -23265,7 +21418,7 @@
return 0;
}
@@ -26690,7 +27314,7 @@
{
if (
(strm << _tao_aggregate.name.in ()) &&
-@@ -22469,7 +20622,7 @@
+@@ -23285,7 +21438,7 @@
}
@@ -26699,7 +27323,7 @@
{
if (
(strm >> _tao_aggregate.name.out ()) &&
-@@ -22489,7 +20642,7 @@
+@@ -23305,7 +21458,7 @@
}
@@ -26708,7 +27332,7 @@
{
if (
(strm << _tao_aggregate.name.in ()) &&
-@@ -22506,7 +20659,7 @@
+@@ -23322,7 +21475,7 @@
}
@@ -26717,7 +27341,7 @@
{
if (
(strm >> _tao_aggregate.name.out ()) &&
-@@ -22523,36 +20676,19 @@
+@@ -23339,36 +21492,19 @@
}
@@ -26757,7 +27381,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22562,7 +20698,7 @@
+@@ -23378,7 +21514,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -26766,7 +27390,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -22572,7 +20708,7 @@
+@@ -23388,7 +21524,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -26775,7 +27399,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -22589,19 +20725,8 @@
+@@ -23405,19 +21541,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -26796,7 +27420,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22611,7 +20736,7 @@
+@@ -23427,7 +21552,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -26805,7 +27429,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -22621,7 +20746,7 @@
+@@ -23437,7 +21562,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -26814,7 +27438,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -22636,7 +20761,7 @@
+@@ -23452,7 +21577,7 @@
return 0;
}
@@ -26823,7 +27447,7 @@
{
if (
(strm << _tao_aggregate.name.in ()) &&
-@@ -22661,7 +20786,7 @@
+@@ -23477,7 +21602,7 @@
}
@@ -26832,7 +27456,7 @@
{
if (
(strm >> _tao_aggregate.name.out ()) &&
-@@ -22688,19 +20813,8 @@
+@@ -23504,19 +21629,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -26853,7 +27477,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22710,7 +20824,7 @@
+@@ -23526,7 +21640,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -26862,7 +27486,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -22720,7 +20834,7 @@
+@@ -23536,7 +21650,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -26871,7 +27495,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -22737,19 +20851,8 @@
+@@ -23553,19 +21667,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -26892,7 +27516,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22759,7 +20862,7 @@
+@@ -23575,7 +21678,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -26901,7 +27525,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -22769,7 +20872,7 @@
+@@ -23585,7 +21688,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -26910,7 +27534,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -22784,7 +20887,7 @@
+@@ -23600,7 +21703,7 @@
return 0;
}
@@ -26919,7 +27543,7 @@
{
if (
(strm << _tao_aggregate.name.in ()) &&
-@@ -22799,7 +20902,7 @@
+@@ -23615,7 +21718,7 @@
}
@@ -26928,7 +27552,7 @@
{
if (
(strm >> _tao_aggregate.name.out ()) &&
-@@ -22816,19 +20919,8 @@
+@@ -23632,19 +21735,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -26949,7 +27573,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22838,7 +20930,7 @@
+@@ -23654,7 +21746,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -26958,7 +27582,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -22848,7 +20940,7 @@
+@@ -23664,7 +21756,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -26967,7 +27591,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -22863,7 +20955,7 @@
+@@ -23679,7 +21771,7 @@
return 0;
}
@@ -26976,7 +27600,7 @@
{
if (
(strm << _tao_aggregate.name.in ()) &&
-@@ -22879,7 +20971,7 @@
+@@ -23695,7 +21787,7 @@
}
@@ -26985,7 +27609,7 @@
{
if (
(strm >> _tao_aggregate.name.out ()) &&
-@@ -22895,51 +20987,28 @@
+@@ -23711,51 +21803,28 @@
}
@@ -27042,7 +27666,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22949,7 +21018,7 @@
+@@ -23765,7 +21834,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -27051,7 +27675,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -22959,7 +21028,7 @@
+@@ -23775,7 +21844,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -27060,7 +27684,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -22974,7 +21043,7 @@
+@@ -23790,7 +21859,7 @@
return 0;
}
@@ -27069,7 +27693,7 @@
{
if (
(strm << _tao_aggregate.name.in ()) &&
-@@ -22989,7 +21058,7 @@
+@@ -23805,7 +21874,7 @@
}
@@ -27078,7 +27702,7 @@
{
if (
(strm >> _tao_aggregate.name.out ()) &&
-@@ -23006,19 +21075,8 @@
+@@ -23822,19 +21891,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -27099,7 +27723,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23028,7 +21086,7 @@
+@@ -23844,7 +21902,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -27108,7 +27732,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -23038,7 +21096,7 @@
+@@ -23854,7 +21912,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -27117,7 +27741,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -23055,19 +21113,8 @@
+@@ -23871,19 +21929,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -27138,7 +27762,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23077,7 +21124,7 @@
+@@ -23893,7 +21940,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -27147,7 +27771,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -23087,7 +21134,7 @@
+@@ -23903,7 +21950,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -27156,7 +27780,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -23104,19 +21151,8 @@
+@@ -23920,19 +21967,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -27177,7 +27801,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23126,7 +21162,7 @@
+@@ -23942,7 +21978,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -27186,7 +27810,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -23136,7 +21172,7 @@
+@@ -23952,7 +21988,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -27195,7 +27819,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -23153,19 +21189,8 @@
+@@ -23969,19 +22005,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -27216,7 +27840,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23175,7 +21200,7 @@
+@@ -23991,7 +22016,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -27225,7 +27849,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -23185,7 +21210,7 @@
+@@ -24001,7 +22026,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -27234,7 +27858,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -23200,7 +21225,7 @@
+@@ -24016,7 +22041,7 @@
return 0;
}
@@ -27243,7 +27867,7 @@
{
if (
(strm << _tao_aggregate.name.in ()) &&
-@@ -23223,7 +21248,7 @@
+@@ -24039,7 +22064,7 @@
}
@@ -27252,7 +27876,7 @@
{
if (
(strm >> _tao_aggregate.name.out ()) &&
-@@ -23248,19 +21273,8 @@
+@@ -24064,19 +22089,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -27273,7 +27897,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23270,7 +21284,7 @@
+@@ -24086,7 +22100,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -27282,7 +27906,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -23280,7 +21294,7 @@
+@@ -24096,7 +22110,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -27291,7 +27915,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -23295,7 +21309,7 @@
+@@ -24111,7 +22125,7 @@
return 0;
}
@@ -27300,7 +27924,7 @@
{
if (
(strm << _tao_aggregate.name.in ()) &&
-@@ -23310,7 +21324,7 @@
+@@ -24126,7 +22140,7 @@
}
@@ -27309,7 +27933,7 @@
{
if (
(strm >> _tao_aggregate.name.out ()) &&
-@@ -23327,19 +21341,8 @@
+@@ -24143,19 +22157,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -27330,7 +27954,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23349,7 +21352,7 @@
+@@ -24165,7 +22168,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -27339,7 +27963,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -23359,7 +21362,7 @@
+@@ -24175,7 +22178,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -27348,7 +27972,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -23376,19 +21379,8 @@
+@@ -24192,19 +22195,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -27369,7 +27993,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23398,7 +21390,7 @@
+@@ -24214,7 +22206,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -27378,7 +28002,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -23408,7 +21400,7 @@
+@@ -24224,7 +22216,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -27387,7 +28011,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -23425,19 +21417,8 @@
+@@ -24241,19 +22233,8 @@
ACE_INLINE CORBA::Boolean
operator<< (
@@ -27408,7 +28032,7 @@
)
{
CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23447,7 +21428,7 @@
+@@ -24263,7 +22244,7 @@
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
@@ -27417,7 +28041,7 @@
)
{
ACE_TRY_NEW_ENV
-@@ -23457,7 +21438,7 @@
+@@ -24273,7 +22254,7 @@
return 0;
// narrow to the right type
_tao_objref =
@@ -27426,7 +28050,7 @@
obj.in (),
ACE_TRY_ENV
);
-@@ -23472,7 +21453,7 @@
+@@ -24288,7 +22269,7 @@
return 0;
}
@@ -27435,7 +28059,7 @@
{
if (
(strm << _tao_aggregate.name.in ()) &&
-@@ -23494,7 +21475,7 @@
+@@ -24310,7 +22291,7 @@
}
View Lorry Controller Status