From 7029ad07d24ea493172d3b802e75755f07b3a8f0 Mon Sep 17 00:00:00 2001 From: bala Date: Thu, 7 Dec 2000 23:49:59 +0000 Subject: ChangeLogTag: Thu Dec 7 17:36:47 2000 Balachandran Natarajan --- TAO/tao/diffs/MessagingS.cpp.diff | 8 +- TAO/tao/diffs/MessagingS.h.diff | 74 +- TAO/tao/diffs/PolicyC.cpp.diff | 3380 ++----------------------------------- TAO/tao/diffs/PolicyC.h.diff | 1733 ++----------------- TAO/tao/diffs/PolicyC.i.diff | 179 +- TAO/tao/diffs/RTCORBAC.cpp.diff | 253 ++- TAO/tao/diffs/RTCORBAC.h.diff | 436 ++++- TAO/tao/diffs/RTCORBAC.i.diff | 535 +++++- TAO/tao/diffs/TAOC.h.diff | 81 +- 9 files changed, 1603 insertions(+), 5076 deletions(-) diff --git a/TAO/tao/diffs/MessagingS.cpp.diff b/TAO/tao/diffs/MessagingS.cpp.diff index aed87cfa562..5546aacfc13 100644 --- a/TAO/tao/diffs/MessagingS.cpp.diff +++ b/TAO/tao/diffs/MessagingS.cpp.diff @@ -79,8 +79,8 @@ } void POA_Messaging::ReplyHandler::_is_a_skel ( -- CORBA::ServerRequest &_tao_server_request, -+ CORBA::ServerRequest &_tao_server_request, +- TAO_ServerRequest &_tao_server_request, ++ TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV @@ -101,8 +101,8 @@ } void POA_Messaging::ReplyHandler::_non_existent_skel ( -- CORBA::ServerRequest &_tao_server_request, -+ CORBA::ServerRequest &_tao_server_request, +- TAO_ServerRequest &_tao_server_request, ++ TAO_ServerRequest &_tao_server_request, void * _tao_object_reference, void * /* context */, CORBA::Environment &ACE_TRY_ENV diff --git a/TAO/tao/diffs/MessagingS.h.diff b/TAO/tao/diffs/MessagingS.h.diff index d96b61992f5..2069a5d628a 100644 --- a/TAO/tao/diffs/MessagingS.h.diff +++ b/TAO/tao/diffs/MessagingS.h.diff @@ -1,8 +1,8 @@ ---- orig/MessagingS.h Sun Apr 30 18:03:08 2000 -+++ MessagingS.h Sun Apr 30 18:06:01 2000 +--- orig/MessagingS.h Sun Apr 30 18:03:08 2000 ++++ MessagingS.h Sun Apr 30 18:06:01 2000 @@ -11,11 +11,15 @@ #define _TAO_IDL_ORIG_MESSAGINGS_H_ - + #include "ace/pre.h" + +#include "orbconf.h" @@ -14,13 +14,13 @@ -#include "PolicyS.h" -#include "PollableS.h" #include "MessagingC.h" -+#include "POAC.h" ++#include "PortableServerC.h" +#include "Servant_Base.h" - - + + #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -31,6 +35,9 @@ - + TAO_NAMESPACE POA_Messaging { + @@ -30,84 +30,84 @@ typedef ReplyHandler *ReplyHandler_ptr; class TAO_Export ReplyHandler : public virtual PortableServer::ServantBase @@ -45,7 +52,7 @@ - + virtual CORBA::Boolean _is_a ( const char* logical_type_id, -- CORBA::Environment &ACE_TRY_ENV = +- CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); - + @@ -57,7 +64,7 @@ CORBA::ServerRequest &req, void *obj, void *context, -- CORBA::Environment &ACE_TRY_ENV = +- CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); - + @@ -65,19 +72,19 @@ CORBA::ServerRequest &req, void *obj, void *context, -- CORBA::Environment &ACE_TRY_ENV = +- CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); - + virtual void _dispatch ( CORBA::ServerRequest &_tao_req, void *_tao_context, -- CORBA::Environment &ACE_TRY_ENV = +- CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); - + ::Messaging::ReplyHandler *_this ( -- CORBA::Environment &ACE_TRY_ENV = +- CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); - + @@ -100,11 +107,11 @@ const CORBA::Char *logical_type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); -- +- + virtual CORBA::Boolean _non_existent( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); -- +- + }; - - + + @@ -125,14 +132,14 @@ const CORBA::Char *logical_type_id, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); -- +- + ReplyHandler_ptr _get_servant (void) const; -- +- + virtual CORBA::Boolean _non_existent( CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () ); -- -- +- +- + + private: ReplyHandler_ptr servant_; }; @@ -140,7 +147,7 @@ - + #endif /* end #if !defined */ - -- + +- + #if defined (ACE_HAS_USING_KEYWORD) // TIE class: Refer to CORBA v2.2, Section 20.34.4 @@ -116,7 +116,7 @@ // ctor with T*, ownership flag and a POA ~ReplyHandler_tie (void); // dtor -- +- + // TIE specific functions T *_tied_object (void); @@ -125,11 +125,11 @@ // 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 = +- CORBA::Environment &ACE_TRY_ENV = + CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () ); @@ -137,26 +137,26 @@ T *ptr_; PortableServer::POA_var poa_; CORBA::Boolean rel_; -- +- + // copy and assignment are not allowed ReplyHandler_tie (const ReplyHandler_tie &); void operator= (const ReplyHandler_tie &); @@ -187,6 +194,8 @@ - + #endif /* ACE_HAS_USING_KEYWORD */ - + +#endif /* TAO_HAS_AMI_CALLBACK == 1 */ + } TAO_NAMESPACE_CLOSE - + @@ -199,6 +208,8 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) #endif /* _MSC_VER */ + +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */ - + #include "ace/post.h" #endif /* ifndef */ diff --git a/TAO/tao/diffs/PolicyC.cpp.diff b/TAO/tao/diffs/PolicyC.cpp.diff index 194e04e7464..5e7c4c0631f 100644 --- a/TAO/tao/diffs/PolicyC.cpp.diff +++ b/TAO/tao/diffs/PolicyC.cpp.diff @@ -1,30 +1,18 @@ ---- orig/PolicyC.cpp Thu Jun 15 14:01:44 2000 -+++ PolicyC.cpp Wed Jun 7 13:29:46 2000 -@@ -1,78 +1,72 @@ --/* -*- C++ -*- $Id$ */ -+// $Id$ -+ -+/* -*- C++ -*- */ - - // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* --// TAO and the TAO IDL Compiler have been developed by the Center for --// Distributed Object Computing at Washington University, St. Louis. -+// TAO ORB and the TAO IDL Compiler have been developed by Washington -+// University Computer Science's Distributed Object Computing Group. - // --// Information about TAO is available at: -+// Information on TAO is available at +--- PolicyC.cpp Fri Jul 14 06:06:05 2000 ++++ PolicyC.cpp.mod Fri Jul 14 06:02:43 2000 +@@ -7,52 +7,40 @@ + // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html -#include "PolicyC.h" +#include "tao/PolicyC.h" +#include "tao/Stub.h" -+#include "tao/Servant_Base.h" -+#include "tao/POA_CORBA.h" +#include "tao/Invocation.h" ++#include "tao/NVList.h" #if !defined (__ACE_INLINE__) - #include "PolicyC.i" +-#include "PolicyC.i" ++#include "tao/PolicyC.i" #endif /* !defined INLINE */ -static const CORBA::Long _oc_CORBA_PolicyErrorCode[] = @@ -33,3260 +21,252 @@ - 38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x4572726f), ACE_NTOHL (0x72436f64), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/PolicyErrorCode:1.0 - 16, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63794572), ACE_NTOHL (0x726f7243), ACE_NTOHL (0x6f646500), // name = PolicyErrorCode - CORBA::tk_short, -- ++// **************************************************************** + -}; -static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyErrorCode (CORBA::tk_alias, sizeof (_oc_CORBA_PolicyErrorCode), (char *) &_oc_CORBA_PolicyErrorCode, 0, sizeof (CORBA::PolicyErrorCode)); -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) --TAO_NAMESPACE_BEGIN (CORBA) --TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyErrorCode, &_tc_TAO_tc_CORBA_PolicyErrorCode) --TAO_NAMESPACE_END --TAO_NAMESPACE_TYPE (const CORBA::Short) -+ACE_RCSID(tao, PolicyC, "$Id$") -+ -+// **************************************************************** -+ +TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode) TAO_NAMESPACE_BEGIN (CORBA) --TAO_NAMESPACE_DEFINE (const CORBA::Short, BAD_POLICY, 0) +-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyErrorCode, &_tc_TAO_tc_CORBA_PolicyErrorCode) +TAO_NAMESPACE_DEFINE (const CORBA::PolicyErrorCode, BAD_POLICY, 0) TAO_NAMESPACE_END --TAO_NAMESPACE_TYPE (const CORBA::Short) +-static const CORBA::Long _oc_CORBA_PolicyType[] = +-{ +- TAO_ENCAP_BYTE_ORDER, // byte order +- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x54797065), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyType:1.0 +- 11, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795479), ACE_NTOHL (0x70650000), // name = PolicyType +- CORBA::tk_ulong, +- +-}; +-static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyType (CORBA::tk_alias, sizeof (_oc_CORBA_PolicyType), (char *) &_oc_CORBA_PolicyType, 0, sizeof (CORBA::PolicyType)); +-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode) TAO_NAMESPACE_BEGIN (CORBA) --TAO_NAMESPACE_DEFINE (const CORBA::Short, UNSUPPORTED_POLICY, 1) +-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyType, &_tc_TAO_tc_CORBA_PolicyType) +TAO_NAMESPACE_DEFINE (const CORBA::PolicyErrorCode, UNSUPPORTED_POLICY, 1) TAO_NAMESPACE_END --TAO_NAMESPACE_TYPE (const CORBA::Short) +-static const CORBA::Long _oc_CORBA_SetOverrideType[] = +-{ +- TAO_ENCAP_BYTE_ORDER, // byte order +- 38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5365), ACE_NTOHL (0x744f7665), ACE_NTOHL (0x72726964), ACE_NTOHL (0x65547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/SetOverrideType:1.0 +- 16, ACE_NTOHL (0x5365744f), ACE_NTOHL (0x76657272), ACE_NTOHL (0x69646554), ACE_NTOHL (0x79706500), // name = SetOverrideType +- 2, // member count +- 13, ACE_NTOHL (0x5345545f), ACE_NTOHL (0x4f564552), ACE_NTOHL (0x52494445), ACE_NTOHL (0x0), // name = SET_OVERRIDE +- 13, ACE_NTOHL (0x4144445f), ACE_NTOHL (0x4f564552), ACE_NTOHL (0x52494445), ACE_NTOHL (0x0), // name = ADD_OVERRIDE +-}; +-static CORBA::TypeCode _tc_TAO_tc_CORBA_SetOverrideType (CORBA::tk_enum, sizeof (_oc_CORBA_SetOverrideType), (char *) &_oc_CORBA_SetOverrideType, 0, sizeof (CORBA::SetOverrideType)); +-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) +TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode) - TAO_NAMESPACE_BEGIN (CORBA) --TAO_NAMESPACE_DEFINE (const CORBA::Short, BAD_POLICY_TYPE, 2) ++TAO_NAMESPACE_BEGIN (CORBA) +TAO_NAMESPACE_DEFINE (const CORBA::PolicyErrorCode, BAD_POLICY_TYPE, 2) - TAO_NAMESPACE_END --TAO_NAMESPACE_TYPE (const CORBA::Short) ++TAO_NAMESPACE_END +TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode) TAO_NAMESPACE_BEGIN (CORBA) --TAO_NAMESPACE_DEFINE (const CORBA::Short, BAD_POLICY_VALUE, 3) +-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SetOverrideType, &_tc_TAO_tc_CORBA_SetOverrideType) +TAO_NAMESPACE_DEFINE (const CORBA::PolicyErrorCode, BAD_POLICY_VALUE, 3) TAO_NAMESPACE_END --TAO_NAMESPACE_TYPE (const CORBA::Short) +TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode) - TAO_NAMESPACE_BEGIN (CORBA) --TAO_NAMESPACE_DEFINE (const CORBA::Short, UNSUPPORTED_POLICY_VALUE, 4) ++TAO_NAMESPACE_BEGIN (CORBA) +TAO_NAMESPACE_DEFINE (const CORBA::PolicyErrorCode, UNSUPPORTED_POLICY_VALUE, 4) - TAO_NAMESPACE_END ++TAO_NAMESPACE_END + +// **************************************************************** + // default constructor --CORBA::PolicyError::PolicyError (void) -- : CORBA_UserException (::CORBA::_tc_PolicyError) -+CORBA_PolicyError::CORBA_PolicyError (void) -+ : CORBA_UserException (CORBA::_tc_PolicyError) - { - } - - // destructor - all members are of self managing types --CORBA::PolicyError::~PolicyError (void) -+CORBA_PolicyError::~CORBA_PolicyError (void) - { - } - --void CORBA::PolicyError::_tao_any_destructor (void *x) --{ -- PolicyError *tmp = ACE_static_cast (PolicyError*,x); -- delete tmp; --} -- - // copy constructor --CORBA::PolicyError::PolicyError (const ::CORBA::PolicyError &_tao_excp) -+CORBA_PolicyError::CORBA_PolicyError (const CORBA_PolicyError &_tao_excp) - : CORBA_UserException (_tao_excp._type ()) - { - this->reason = _tao_excp.reason; - } - - // assignment operator --CORBA::PolicyError& --CORBA::PolicyError::operator= (const ::CORBA::PolicyError &_tao_excp) -+CORBA_PolicyError& -+CORBA_PolicyError::operator= (const CORBA_PolicyError &_tao_excp) - { - - this->CORBA_UserException::operator= (_tao_excp); -@@ -81,35 +75,30 @@ - } - - // narrow --CORBA::PolicyError * --CORBA::PolicyError::_downcast (CORBA::Exception *exc) -+CORBA_PolicyError_ptr -+CORBA_PolicyError::_downcast (CORBA::Exception *exc) - { - if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PolicyError:1.0", exc->_id ())) // same type -- return ACE_dynamic_cast (PolicyError *, exc); -+ return ACE_dynamic_cast (CORBA_PolicyError_ptr, exc); + CORBA_PolicyError::CORBA_PolicyError (void) + : CORBA_UserException (::_tc_CORBA_PolicyError) +@@ -91,7 +79,7 @@ + CORBA_PolicyError * + CORBA_PolicyError::_downcast (CORBA::Exception *exc) + { +- if (!ACE_OS::strcmp ("IDL:omg.org/CORBA_PolicyError:1.0", exc->_id ())) // same type ++ if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PolicyError:1.0", exc->_id ())) // same type + return ACE_dynamic_cast (CORBA_PolicyError *, exc); else return 0; - } - -- --void CORBA::PolicyError::_raise () -+void CORBA_PolicyError::_raise (void) - { - TAO_RAISE(*this); - } - -- --void CORBA::PolicyError::_tao_encode ( -- TAO_OutputCDR &cdr, -- CORBA::Environment &ACE_TRY_ENV) const -+void CORBA_PolicyError::_tao_encode (TAO_OutputCDR &cdr, -+ CORBA::Environment &ACE_TRY_ENV) const - { - if (cdr << *this) - return; - ACE_THROW (CORBA::MARSHAL ()); - } - -- --void CORBA::PolicyError::_tao_decode ( -- TAO_InputCDR &cdr, -- CORBA::Environment &ACE_TRY_ENV) -+void CORBA_PolicyError::_tao_decode (TAO_InputCDR &cdr, -+ CORBA::Environment &ACE_TRY_ENV) - { - if (cdr >> *this) - return; -@@ -117,165 +106,47 @@ - } - - // TAO extension - the _alloc method --CORBA::Exception *CORBA::PolicyError::_alloc (void) -+CORBA::Exception *CORBA_PolicyError::_alloc (void) - { - CORBA::Exception *retval = 0; -- ACE_NEW_RETURN (retval, ::CORBA::PolicyError, 0); -+ -+ ACE_NEW_RETURN (retval, -+ CORBA_PolicyError, -+ 0); - return retval; - } - --CORBA::PolicyError::PolicyError ( -- CORBA::PolicyErrorCode _tao_reason --) -+CORBA_PolicyError::CORBA_PolicyError( -+ CORBA::PolicyErrorCode _tao_reason) -+ - : CORBA_UserException (CORBA::TypeCode::_duplicate (CORBA::_tc_PolicyError)) - { - this->reason = _tao_reason; - } - --static const CORBA::Long _oc_CORBA_PolicyError[] = --{ -- TAO_ENCAP_BYTE_ORDER, // byte order -- 34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x4572726f), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/PolicyError:1.0 -- 12, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63794572), ACE_NTOHL (0x726f7200), // name = PolicyError -- 1, // member count -- 7, ACE_NTOHL (0x72656173), ACE_NTOHL (0x6f6e0000), // name = reason -- CORBA::tk_alias, // typecode kind for typedefs -- 72, // encapsulation length -- TAO_ENCAP_BYTE_ORDER, // byte order -- 38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x4572726f), ACE_NTOHL (0x72436f64), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/PolicyErrorCode:1.0 -- 16, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63794572), ACE_NTOHL (0x726f7243), ACE_NTOHL (0x6f646500), // name = PolicyErrorCode -- CORBA::tk_short, -- -- --}; --static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyError (CORBA::tk_except, sizeof (_oc_CORBA_PolicyError), (char *) &_oc_CORBA_PolicyError, 0, sizeof (CORBA::PolicyError)); --TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) --TAO_NAMESPACE_BEGIN (CORBA) --TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyError, &_tc_TAO_tc_CORBA_PolicyError) --TAO_NAMESPACE_END -- --#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -- --#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CS_) --#define __TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CS_ -- -- void -- CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_allocate_buffer (CORBA::ULong length) -- { -- CORBA::UShort* tmp = 0; -- tmp = _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::allocbuf (length); -- -- if (this->buffer_ != 0) -- { -- CORBA::UShort *old = ACE_reinterpret_cast (CORBA::UShort *,this->buffer_); -- -- for (CORBA::ULong i = 0; i < this->length_; ++i) -- tmp[i] = old[i]; -- -- if (this->release_) -- _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (old); -- -- } -- this->buffer_ = tmp; -- } -- -- void -- CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::_deallocate_buffer (void) -- { -- if (this->buffer_ == 0 || this->release_ == 0) -- return; -- -- CORBA::UShort *tmp = ACE_reinterpret_cast (CORBA::UShort *,this->buffer_); -- -- _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::freebuf (tmp); -- this->buffer_ = 0; -- } -- -- CORBA::InvalidPolicies::_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort::~_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void) // Dtor. -- { -- this->_deallocate_buffer (); -- } -- -- --#endif /* end #if !defined */ -- -- --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -- --#if !defined (_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CS_) --#define _CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CS_ -- --// ************************************************************* --// CORBA::InvalidPolicies::_tao_seq_UShort --// ************************************************************* -- --CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (void) --{} --CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (CORBA::ULong max) // uses max size -- : --#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -- _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort --#else /* TAO_USE_SEQUENCE_TEMPLATES */ -- TAO_Unbounded_Sequence --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -- (max) --{} --CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (CORBA::ULong max, CORBA::ULong length, CORBA::UShort *buffer, CORBA::Boolean release) -- : --#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -- _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort --#else /* TAO_USE_SEQUENCE_TEMPLATES */ -- TAO_Unbounded_Sequence --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -- (max, length, buffer, release) --{} --CORBA::InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (const _tao_seq_UShort &seq) // copy ctor -- : --#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -- _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort --#else /* TAO_USE_SEQUENCE_TEMPLATES */ -- TAO_Unbounded_Sequence --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -- (seq) --{} --CORBA::InvalidPolicies::_tao_seq_UShort::~_tao_seq_UShort (void) // dtor --{} --void CORBA::InvalidPolicies::_tao_seq_UShort::_tao_any_destructor (void *x) --{ -- _tao_seq_UShort *tmp = ACE_static_cast (_tao_seq_UShort*,x); -- delete tmp; --} -- -- --#endif /* end #if !defined */ -+// **************************************************************** - - // default constructor --CORBA::InvalidPolicies::InvalidPolicies (void) -- : CORBA_UserException (::CORBA::_tc_InvalidPolicies) -+CORBA_InvalidPolicies::CORBA_InvalidPolicies (void) -+ : CORBA_UserException (CORBA::_tc_InvalidPolicies) - { - } - - // destructor - all members are of self managing types --CORBA::InvalidPolicies::~InvalidPolicies (void) -+CORBA_InvalidPolicies::~CORBA_InvalidPolicies (void) - { - } - --void CORBA::InvalidPolicies::_tao_any_destructor (void *x) --{ -- InvalidPolicies *tmp = ACE_static_cast (InvalidPolicies*,x); -- delete tmp; --} -- - // copy constructor --CORBA::InvalidPolicies::InvalidPolicies (const ::CORBA::InvalidPolicies &_tao_excp) -+CORBA_InvalidPolicies::CORBA_InvalidPolicies (const CORBA_InvalidPolicies &_tao_excp) - : CORBA_UserException (_tao_excp._type ()) - { - this->indices = _tao_excp.indices; - } - - // assignment operator --CORBA::InvalidPolicies& --CORBA::InvalidPolicies::operator= (const ::CORBA::InvalidPolicies &_tao_excp) -+CORBA_InvalidPolicies& -+CORBA_InvalidPolicies::operator= (const CORBA_InvalidPolicies &_tao_excp) - { - - this->CORBA_UserException::operator= (_tao_excp); -@@ -284,35 +155,30 @@ - } - - // narrow --CORBA::InvalidPolicies * --CORBA::InvalidPolicies::_downcast (CORBA::Exception *exc) -+CORBA_InvalidPolicies_ptr -+CORBA_InvalidPolicies::_downcast (CORBA::Exception *exc) +@@ -292,7 +280,7 @@ + CORBA_InvalidPolicies * + CORBA_InvalidPolicies::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/InvalidPolicies:1.0", exc->_id ())) // same type -- return ACE_dynamic_cast (InvalidPolicies *, exc); -+ return ACE_dynamic_cast (CORBA_InvalidPolicies_ptr, exc); +- if (!ACE_OS::strcmp ("IDL:omg.org/CORBA_InvalidPolicies:1.0", exc->_id ())) // same type ++ if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/InvalidPolicies:1.0", exc->_id ())) // same type + return ACE_dynamic_cast (CORBA_InvalidPolicies *, exc); else return 0; - } - -- --void CORBA::InvalidPolicies::_raise () -+void CORBA_InvalidPolicies::_raise (void) - { - TAO_RAISE(*this); - } - -- --void CORBA::InvalidPolicies::_tao_encode ( -- TAO_OutputCDR &cdr, -- CORBA::Environment &ACE_TRY_ENV) const -+void CORBA_InvalidPolicies::_tao_encode (TAO_OutputCDR &cdr, -+ CORBA::Environment &ACE_TRY_ENV) const - { - if (cdr << *this) - return; - ACE_THROW (CORBA::MARSHAL ()); - } - -- --void CORBA::InvalidPolicies::_tao_decode ( -- TAO_InputCDR &cdr, -- CORBA::Environment &ACE_TRY_ENV) -+void CORBA_InvalidPolicies::_tao_decode (TAO_InputCDR &cdr, -+ CORBA::Environment &ACE_TRY_ENV) +@@ -382,7 +370,7 @@ + return CORBA_Policy::_nil (); + if (! obj->_is_local ()) + { +- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_Policy:1.0", ACE_TRY_ENV); ++ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Policy:1.0", ACE_TRY_ENV); + ACE_CHECK_RETURN (CORBA_Policy::_nil ()); + if (is_a == 0) + return CORBA_Policy::_nil (); +@@ -409,12 +397,8 @@ + default_proxy = _TAO_collocation_CORBA_Policy_Stub_Factory_function_pointer (obj); + } + if (CORBA::is_nil (default_proxy)) +- ACE_NEW_RETURN (default_proxy, ::CORBA_Policy (stub), CORBA_Policy::_nil ()); +- #if (TAO_HAS_SMART_PROXIES == 1) +- return TAO_CORBA_Policy_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy); +- #else ++ ACE_NEW_RETURN (default_proxy, CORBA_Policy (stub), CORBA_Policy::_nil ()); + return default_proxy; +- #endif /*TAO_HAS_SMART_PROXIES == 1*/ + } + else + return +@@ -786,7 +770,7 @@ + CORBA::Boolean CORBA_Policy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) { - if (cdr >> *this) - return; -@@ -320,269 +186,143 @@ - } + if ( +- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Policy:1.0")) || ++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) || + (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) + return 1; // success using local knowledge + else +@@ -811,7 +795,19 @@ - // TAO extension - the _alloc method --CORBA::Exception *CORBA::InvalidPolicies::_alloc (void) -+CORBA::Exception *CORBA_InvalidPolicies::_alloc (void) + const char* CORBA_Policy::_interface_repository_id (void) const { - CORBA::Exception *retval = 0; -- ACE_NEW_RETURN (retval, ::CORBA::InvalidPolicies, 0); +- return "IDL:omg.org/CORBA_Policy:1.0"; ++ return "IDL:omg.org/CORBA/Policy:1.0"; ++} + -+ ACE_NEW_RETURN (retval, -+ CORBA_InvalidPolicies, -+ 0); ++CORBA::Boolean ++CORBA_Policy::_tao_encode (TAO_OutputCDR &) ++{ ++ return 0; ++} + - return retval; ++CORBA::Boolean ++CORBA_Policy::_tao_decode (TAO_InputCDR &) ++{ ++ return 0; } --CORBA::InvalidPolicies::InvalidPolicies ( -- const CORBA::InvalidPolicies::_tao_seq_UShort & _tao_indices --) -+CORBA_InvalidPolicies::CORBA_InvalidPolicies( -+ const CORBA_InvalidPolicies::_tao_seq_UShort & _tao_indices) -+ - : CORBA_UserException (CORBA::TypeCode::_duplicate (CORBA::_tc_InvalidPolicies)) - { - this->indices = _tao_indices; - } + static const CORBA::Long _oc_CORBA_Policy[] = +@@ -1156,75 +1152,7 @@ --static const CORBA::Long _oc_CORBA_InvalidPolicies[] = --{ -- TAO_ENCAP_BYTE_ORDER, // byte order -- 38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f496e), ACE_NTOHL (0x76616c69), ACE_NTOHL (0x64506f6c), ACE_NTOHL (0x69636965), ACE_NTOHL (0x733a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/InvalidPolicies:1.0 -- 16, ACE_NTOHL (0x496e7661), ACE_NTOHL (0x6c696450), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x69657300), // name = InvalidPolicies -- 1, // member count -- 8, ACE_NTOHL (0x696e6469), ACE_NTOHL (0x63657300), // name = indices -- CORBA::tk_sequence, // typecode kind -- 12, // encapsulation length -- TAO_ENCAP_BYTE_ORDER, // byte order -- CORBA::tk_ushort, -- -- 0U, -- --}; --static CORBA::TypeCode _tc_TAO_tc_CORBA_InvalidPolicies (CORBA::tk_except, sizeof (_oc_CORBA_InvalidPolicies), (char *) &_oc_CORBA_InvalidPolicies, 0, sizeof (CORBA::InvalidPolicies)); --TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) --TAO_NAMESPACE_BEGIN (CORBA) --TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InvalidPolicies, &_tc_TAO_tc_CORBA_InvalidPolicies) --TAO_NAMESPACE_END --static const CORBA::Long _oc_CORBA_PolicyType[] = --{ -- TAO_ENCAP_BYTE_ORDER, // byte order -- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x54797065), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyType:1.0 -- 11, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795479), ACE_NTOHL (0x70650000), // name = PolicyType -- CORBA::tk_ulong, + const char* CORBA_PolicyManager::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_PolicyManager:1.0"; +-} - --}; --static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyType (CORBA::tk_alias, sizeof (_oc_CORBA_PolicyType), (char *) &_oc_CORBA_PolicyType, 0, sizeof (CORBA::PolicyType)); --TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) --TAO_NAMESPACE_BEGIN (CORBA) --TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyType, &_tc_TAO_tc_CORBA_PolicyType) --TAO_NAMESPACE_END - -// default constructor --CORBA::Policy::Policy (void) +-CORBA_Current::CORBA_Current (void) -{} - -// destructor --CORBA::Policy::~Policy (void) +-CORBA_Current::~CORBA_Current (void) -{} - --void CORBA::Policy::_tao_any_destructor (void *x) +-CORBA_Current_ptr CORBA_Current::_narrow ( +- CORBA::Object_ptr obj, +- CORBA::Environment &ACE_TRY_ENV +- ) -{ -- Policy *tmp = ACE_static_cast (Policy*,x); -- CORBA::release (tmp); --} -+// **************************************************************** - --CORBA::Policy_ptr CORBA::Policy::_narrow ( -+CORBA_Policy_ptr CORBA_Policy::_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV - ) - { - if (CORBA::is_nil (obj)) -- return Policy::_nil (); -- if (! obj->_is_local ()) -- { -- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Policy:1.0", ACE_TRY_ENV); -- ACE_CHECK_RETURN (Policy::_nil ()); -- if (is_a == 0) -- return Policy::_nil (); -- } -- return Policy::_unchecked_narrow (obj, ACE_TRY_ENV); +- return CORBA_Current::_unchecked_narrow (obj, ACE_TRY_ENV); -} - --CORBA::Policy_ptr CORBA::Policy::_unchecked_narrow ( +-CORBA_Current_ptr CORBA_Current::_unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment & - ) -{ - if (CORBA::is_nil (obj)) -- return Policy::_nil (); -- if (! obj->_is_local ()) -- { -- TAO_Stub* stub = obj->_stubobj (); -- if (stub) -- stub->_incr_refcnt (); -- Policy_ptr default_proxy = Policy::_nil (); -- -- if (obj->_is_collocated () && _TAO_collocation_CORBA_Policy_Stub_Factory_function_pointer != 0) -- { -- default_proxy = _TAO_collocation_CORBA_Policy_Stub_Factory_function_pointer (obj); -- } -- if (CORBA::is_nil (default_proxy)) -- ACE_NEW_RETURN (default_proxy, Policy (stub), Policy::_nil ()); -- #if (TAO_HAS_SMART_PROXIES == 1) -- return TAO_CORBA_Policy_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy); -- #else -- return default_proxy; -- #endif /*TAO_HAS_SMART_PROXIES == 1*/ -- } -- else -- return +- return CORBA_Current::_nil (); +- return - ACE_reinterpret_cast - ( -- Policy_ptr, +- CORBA_Current_ptr, - obj->_tao_QueryInterface - ( - ACE_reinterpret_cast - ( - ptr_arith_t, -- &Policy::_narrow +- &CORBA_Current::_narrow - ) - ) - ); -} -+ return CORBA_Policy::_nil (); -+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Policy:1.0", ACE_TRY_ENV); -+ ACE_CHECK_RETURN (CORBA_Policy::_nil ()); -+ if (is_a == 0) -+ return CORBA_Policy::_nil (); -+ TAO_Stub* stub = obj->_stubobj (); -+ void* servant = 0; -+ if (obj->_is_collocated () && obj->_servant() != 0) -+ servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/Policy:1.0"); -+#if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) -+ if (servant == 0) -+ ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA::Policy::_nil ()); -+#else -+ stub->_incr_refcnt (); -+ if (servant == 0) -+ { -+ CORBA_Policy_ptr rval = -+ CORBA_Policy::_nil (); -+ -+ ACE_NEW_RETURN (rval, -+ CORBA_Policy (stub), -+ CORBA_Policy::_nil ()); -+ -+ return rval; -+ } -+ -+#endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ -+ -+ CORBA_Policy_ptr retval = -+ CORBA_Policy::_nil (); -+ -+ ACE_NEW_RETURN ( -+ retval, -+ POA_CORBA::_tao_collocated_Policy ( -+ ACE_reinterpret_cast (POA_CORBA::Policy_ptr, -+ servant), -+ stub -+ ), -+ CORBA_Policy::_nil () -+ ); - --CORBA::Policy_ptr --CORBA::Policy::_duplicate (Policy_ptr obj) +- +-CORBA_Current_ptr +-CORBA_Current::_duplicate (CORBA_Current_ptr obj) -{ - if (!CORBA::is_nil (obj)) - obj->_add_ref (); - return obj; -+ return retval; +-} +- +-void *CORBA_Current::_tao_QueryInterface (ptr_arith_t type) +-{ +- void *retv = 0; +- if (type == ACE_reinterpret_cast +- (ptr_arith_t, +- &CORBA_Current::_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_Current::_interface_repository_id (void) const +-{ +- return "IDL:omg.org/CORBA_Current:1.0"; ++ return "IDL:omg.org/CORBA/PolicyManager:1.0"; } --CORBA::PolicyType CORBA::Policy::policy_type ( -+#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) -+CORBA::PolicyType CORBA_Policy::policy_type ( - CORBA::Environment &ACE_TRY_ENV - ) -- ACE_THROW_SPEC (( -- CORBA::SystemException -- )) --{ -- -- CORBA::PolicyType _tao_retval = 0; -- -- -+{ -+ CORBA::PolicyType _tao_retval = 0; -+ - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval); -- -+ - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, -- "_get_policy_type", -+ "_get_""policy_type", - 16, - istub->orb_core () - ); +@@ -1316,7 +1244,7 @@ --#if (TAO_HAS_INTERCEPTORS == 1) -- TAO_ClientRequestInterceptor_Adapter -- _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); -- ACE_CHECK_RETURN (_tao_retval); -- PortableInterceptor::Cookies _tao_cookies; -- CORBA::NVList_var _tao_interceptor_args; -- if (_tao_vfr.valid ()) -- { -- istub->orb_core ()->orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); -- ACE_CHECK_RETURN (_tao_retval); -- } -- -- ACE_TRY -- { --#endif /* TAO_HAS_INTERCEPTORS */ -- -- for (;;) -- { -- _tao_call.start (ACE_TRY_ENV); -- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); -- -- TAO_INTERCEPTOR ( -- _tao_vfr.preinvoke ( -- _tao_call.request_id (), -- 1, -- this, -- "_get_policy_type", -- _tao_call.service_info (), -- _tao_interceptor_args.inout (), -- _tao_cookies, -- ACE_TRY_ENV -- ) -- ); -- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); -- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; -- -- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); -- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); -- -- int _invoke_status = -- _tao_call.invoke (0, 0, ACE_TRY_ENV); -- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); -- -- if (_invoke_status == TAO_INVOKE_RESTART) -- continue; -- if (_invoke_status != TAO_INVOKE_OK) -- { -- 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 ( -- _tao_vfr.postinvoke ( -- _tao_call.request_id (), -- 1, -- this, -- "_get_policy_type", -- _tao_call.service_info (), -- _tao_interceptor_args.inout (), -- _tao_cookies, -- ACE_TRY_ENV -- ) -- ); -- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval); -- break; -- -- } --#if (TAO_HAS_INTERCEPTORS == 1) -- -- } -- ACE_CATCHANY -+ -+ for (;;) -+ { -+ _tao_call.start (ACE_TRY_ENV); -+ ACE_CHECK_RETURN (_tao_retval); -+ -+ CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; -+ -+ _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, 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) -+ continue; -+ // if (_invoke_status == TAO_INVOKE_EXCEPTION) -+ // cannot happen -+ if (_invoke_status != TAO_INVOKE_OK) - { -- _tao_vfr.exception_occurred ( -- _tao_call.request_id (), -- 1, -- this, -- "_get_policy_type", -- _tao_cookies, -- ACE_TRY_ENV -- ); -- ACE_RETHROW; -+ 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 */ -+ 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); - return _tao_retval; + const char* CORBA_PolicyCurrent::_interface_repository_id (void) const + { +- return "IDL:omg.org/CORBA_PolicyCurrent:1.0"; ++ return "IDL:omg.org/CORBA/PolicyCurrent:1.0"; } --CORBA::Policy_ptr CORBA::Policy::copy ( -+CORBA_Policy_ptr CORBA_Policy::copy ( - CORBA::Environment &ACE_TRY_ENV - ) -- ACE_THROW_SPEC (( -- CORBA::SystemException -- )) --{ -- -- CORBA::Policy_ptr _tao_retval = CORBA::Policy::_nil (); -- CORBA::Policy_var _tao_safe_retval (_tao_retval); -- -- -+{ -+ CORBA_Policy_ptr _tao_retval = CORBA_Policy::_nil (); -+ - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) -- ACE_THROW_RETURN (CORBA::INTERNAL (), 0); -+ ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval); -+ - -- - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "copy", -@@ -590,115 +330,52 @@ - istub->orb_core () - ); + void operator<<= (CORBA::Any &_tao_any, CORBA::SetOverrideType _tao_elem) +@@ -1419,7 +1347,7 @@ + return 0; + if (ACE_OS::strcmp ( + interface_repository_id.in (), +- "IDL:omg.org/CORBA_PolicyError:1.0")) ++ "IDL:omg.org/CORBA/PolicyError:1.0")) + return 0; + if (stream >> *tmp) + { +@@ -1507,7 +1435,7 @@ + return 0; + if (ACE_OS::strcmp ( + interface_repository_id.in (), +- "IDL:omg.org/CORBA_InvalidPolicies:1.0")) ++ "IDL:omg.org/CORBA/InvalidPolicies:1.0")) + return 0; + if (stream >> *tmp) + { +@@ -1782,13 +1710,6 @@ --#if (TAO_HAS_INTERCEPTORS == 1) -- TAO_ClientRequestInterceptor_Adapter -- _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); -- ACE_CHECK_RETURN (0); -- PortableInterceptor::Cookies _tao_cookies; -- CORBA::NVList_var _tao_interceptor_args; -- if (_tao_vfr.valid ()) -- { -- istub->orb_core ()->orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); -- ACE_CHECK_RETURN (0); -- } -- -- ACE_TRY -- { --#endif /* TAO_HAS_INTERCEPTORS */ + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) +- template class TAO_Object_Manager; +- #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +- # pragma instantiate TAO_Object_Manager +-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - -- for (;;) -- { -- _tao_call.start (ACE_TRY_ENV); -- TAO_INTERCEPTOR_CHECK_RETURN (0); +-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ +- defined (ACE_HAS_GNU_REPO) + template class TAO_Object_Manager; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + # pragma instantiate TAO_Object_Manager +@@ -1905,4 +1826,3 @@ + } + return 0; // error + } - -- TAO_INTERCEPTOR ( -- _tao_vfr.preinvoke ( -- _tao_call.request_id (), -- 1, -- this, -- "copy", -- _tao_call.service_info (), -- _tao_interceptor_args.inout (), -- _tao_cookies, -- ACE_TRY_ENV -- ) -- ); -- TAO_INTERCEPTOR_CHECK_RETURN (0); -- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; -- -- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); -- TAO_INTERCEPTOR_CHECK_RETURN (0); -- -- int _invoke_status = -- _tao_call.invoke (0, 0, ACE_TRY_ENV); -- TAO_INTERCEPTOR_CHECK_RETURN (0); -- -- if (_invoke_status == TAO_INVOKE_RESTART) -- continue; -- if (_invoke_status != TAO_INVOKE_OK) -- { -- TAO_INTERCEPTOR_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0); -- -- } -- TAO_InputCDR &_tao_in = _tao_call.inp_stream (); -- if (!( -- (_tao_in >> _tao_safe_retval.inout ()) -- )) -- TAO_INTERCEPTOR_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0); -- -- TAO_INTERCEPTOR ( -- _tao_vfr.postinvoke ( -- _tao_call.request_id (), -- 1, -- this, -- "copy", -- _tao_call.service_info (), -- _tao_interceptor_args.inout (), -- _tao_cookies, -- ACE_TRY_ENV -- ) -- ); -- TAO_INTERCEPTOR_CHECK_RETURN (0); -- break; -- -- } --#if (TAO_HAS_INTERCEPTORS == 1) -- -- } -- ACE_CATCHANY -+ -+ for (;;) -+ { -+ _tao_call.start (ACE_TRY_ENV); -+ ACE_CHECK_RETURN (_tao_retval); -+ -+ CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; -+ -+ _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, 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) -+ continue; -+ // if (_invoke_status == TAO_INVOKE_EXCEPTION) -+ // cannot happen -+ if (_invoke_status != TAO_INVOKE_OK) - { -- _tao_vfr.exception_occurred ( -- _tao_call.request_id (), -- 1, -- this, -- "copy", -- _tao_cookies, -- ACE_TRY_ENV -- ); -- ACE_RETHROW; -+ ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); -+ - } -- ACE_ENDTRY; -- ACE_CHECK_RETURN (0); --#endif /* TAO_HAS_INTERCEPTORS */ -- return _tao_safe_retval._retn (); -+ 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); -+ return _tao_retval; - } - --void CORBA::Policy::destroy ( -+void CORBA_Policy::destroy ( - CORBA::Environment &ACE_TRY_ENV - ) -- ACE_THROW_SPEC (( -- CORBA::SystemException -- )) - { -- - -- -- - TAO_Stub *istub = this->_stubobj (); - if (istub == 0) - ACE_THROW (CORBA::INTERNAL ()); - -- -+ - TAO_GIOP_Twoway_Invocation _tao_call ( - istub, - "destroy", -@@ -706,1109 +383,336 @@ - istub->orb_core () - ); - --#if (TAO_HAS_INTERCEPTORS == 1) -- TAO_ClientRequestInterceptor_Adapter -- _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); -- ACE_CHECK; -- PortableInterceptor::Cookies _tao_cookies; -- CORBA::NVList_var _tao_interceptor_args; -- if (_tao_vfr.valid ()) -- { -- istub->orb_core ()->orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); -+ -+ for (;;) -+ { -+ _tao_call.start (ACE_TRY_ENV); - ACE_CHECK; -- } - -- ACE_TRY -- { --#endif /* TAO_HAS_INTERCEPTORS */ -+ CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; - -- for (;;) -- { -- _tao_call.start (ACE_TRY_ENV); -- TAO_INTERCEPTOR_CHECK; -+ _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), -+ ACE_TRY_ENV); -+ ACE_CHECK; - -- TAO_INTERCEPTOR ( -- _tao_vfr.preinvoke ( -- _tao_call.request_id (), -- 1, -- this, -- "destroy", -- _tao_call.service_info (), -- _tao_interceptor_args.inout (), -- _tao_cookies, -- ACE_TRY_ENV -- ) -- ); -- TAO_INTERCEPTOR_CHECK; -- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; -- -- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); -- TAO_INTERCEPTOR_CHECK; -- -- int _invoke_status = -- _tao_call.invoke (0, 0, ACE_TRY_ENV); -- TAO_INTERCEPTOR_CHECK; -- -- if (_invoke_status == TAO_INVOKE_RESTART) -- continue; -- if (_invoke_status != TAO_INVOKE_OK) -- { -- TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); -- } -- -- TAO_INTERCEPTOR ( -- _tao_vfr.postinvoke ( -- _tao_call.request_id (), -- 1, -- this, -- "destroy", -- _tao_call.service_info (), -- _tao_interceptor_args.inout (), -- _tao_cookies, -- ACE_TRY_ENV -- ) -- ); -- TAO_INTERCEPTOR_CHECK; -- break; -- -- } --#if (TAO_HAS_INTERCEPTORS == 1) -- -- } -- ACE_CATCHANY -+ int _invoke_status = -+ _tao_call.invoke (0, 0, ACE_TRY_ENV); -+ ACE_CHECK; -+ -+ if (_invoke_status == TAO_INVOKE_RESTART) -+ continue; -+ // if (_invoke_status == TAO_INVOKE_EXCEPTION) -+ // cannot happen -+ if (_invoke_status != TAO_INVOKE_OK) - { -- _tao_vfr.exception_occurred ( -- _tao_call.request_id (), -- 1, -- this, -- "destroy", -- _tao_cookies, -- ACE_TRY_ENV -- ); -- ACE_RETHROW; -+ ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); -+ - } -- ACE_ENDTRY; -- ACE_CHECK; --#endif /* TAO_HAS_INTERCEPTORS */ -+ break; -+ -+ } - - } -+#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ - --CORBA::Boolean CORBA::Policy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -+CORBA::Boolean CORBA_Policy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) - { - if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy: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->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call - } - --void *CORBA::Policy::_tao_QueryInterface (ptr_arith_t type) -+const char* CORBA_Policy::_interface_repository_id (void) const - { -- void *retv = 0; -- if (type == ACE_reinterpret_cast -- (ptr_arith_t, -- &ACE_NESTED_CLASS (::CORBA, Policy)::_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; -+ return "IDL:omg.org/CORBA/Policy:1.0"; - } - --const char* CORBA::Policy::_interface_repository_id (void) const -+CORBA_Policy_ptr -+CORBA_Policy::_duplicate (CORBA_Policy_ptr obj) - { -- return "IDL:omg.org/CORBA/Policy:1.0"; -+ if (!CORBA::is_nil (obj)) -+ obj->_add_ref (); -+ return obj; - } - --static const CORBA::Long _oc_CORBA_Policy[] = -+CORBA_Policy_ptr -+CORBA_Policy::_nil (void) - { -- TAO_ENCAP_BYTE_ORDER, // byte order -- 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Policy:1.0 -- 7, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000), // name = Policy --}; --static CORBA::TypeCode _tc_TAO_tc_CORBA_Policy (CORBA::tk_objref, sizeof (_oc_CORBA_Policy), (char *) &_oc_CORBA_Policy, 0, sizeof (CORBA::Policy)); --TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) --TAO_NAMESPACE_BEGIN (CORBA) --TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Policy, &_tc_TAO_tc_CORBA_Policy) --TAO_NAMESPACE_END -- --#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -- --#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CS_) --#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CS_ -- -- // The Base_Sequence functions, please see tao/Sequence.h -- void -- CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_allocate_buffer (CORBA::ULong length) -- { -- CORBA::Policy **tmp = 0; -- tmp = _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::allocbuf (length); -- -- if (this->buffer_ != 0) -- { -- CORBA::Policy **old = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_); -- for (CORBA::ULong i = 0; i < this->length_; ++i) -- if (!this->release_) -- tmp[i] = CORBA::Policy::_duplicate (old[i]); -- else -- tmp[i] = old[i]; -- -- if (this->release_) -- delete[] old; -- -- } -- this->buffer_ = tmp; -- } -- -- void -- CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_deallocate_buffer (void) -- { -- if (this->buffer_ == 0 || this->release_ == 0) -- return; -- CORBA::Policy **tmp = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_); -- for (CORBA::ULong i = 0; i < this->length_; ++i) -- { -- CORBA::release (tmp[i]); -- tmp[i] = CORBA::Policy::_nil (); -- } -- _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (tmp); -- this->buffer_ = 0; -- } -- -- CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::~_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (void) -- { -- this->_deallocate_buffer (); -- } -- -- void -- CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol) -- { -- CORBA::Policy **tmp = ACE_reinterpret_cast (CORBA::Policy**, this->buffer_); -- -- for (CORBA::ULong i = nl; i < ol; ++i) -- { -- CORBA::release (tmp[i]); -- tmp[i] = CORBA::Policy::_nil (); -- } -- } -- void -- CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_downcast ( -- void* target, -- CORBA_Object *src, -- CORBA_Environment &ACE_TRY_ENV -- ) -- { -- CORBA::Policy **tmp = ACE_static_cast (CORBA::Policy**, target); -- *tmp = CORBA::Policy::_narrow (src, ACE_TRY_ENV); -- } -- -- CORBA_Object* -- CORBA::_TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_upcast (void *src) const -- { -- CORBA::Policy **tmp = ACE_static_cast (CORBA::Policy**, src); -- return *tmp; -- } -- --#endif /* end #if !defined */ -+ return (CORBA_Policy_ptr)0; -+} - -+//////////////////////////////////////////////////////////////// -+// Serialization Support Methods -+// -+CORBA::Boolean -+CORBA_Policy::_tao_encode (TAO_OutputCDR &) -+{ -+ return 0; -+} - --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -+CORBA::Boolean -+CORBA_Policy::_tao_decode (TAO_InputCDR &) -+{ -+ return 0; -+} - --#if !defined (_CORBA_POLICYLIST_CS_) --#define _CORBA_POLICYLIST_CS_ - - // ************************************************************* --// CORBA::PolicyList -+// CORBA_PolicyList - // ************************************************************* - --CORBA::PolicyList::PolicyList (void) -+CORBA_PolicyList::CORBA_PolicyList (void) - {} --CORBA::PolicyList::PolicyList (CORBA::ULong max) // uses max size -- : --#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -- _TAO_Unbounded_Object_Sequence_CORBA_PolicyList --#else /* TAO_USE_SEQUENCE_TEMPLATES */ -- TAO_Unbounded_Object_Sequence --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -- (max) -+CORBA_PolicyList::CORBA_PolicyList (CORBA::ULong max) // uses max size -+ : TAO_Unbounded_Object_Sequence (max) - {} --CORBA::PolicyList::PolicyList (CORBA::ULong max, CORBA::ULong length, CORBA::Policy_ptr *buffer, CORBA::Boolean release) -- : --#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -- _TAO_Unbounded_Object_Sequence_CORBA_PolicyList --#else /* TAO_USE_SEQUENCE_TEMPLATES */ -- TAO_Unbounded_Object_Sequence --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -- (max, length, buffer, release) -+CORBA_PolicyList::CORBA_PolicyList (CORBA::ULong max, CORBA::ULong length, CORBA_Policy_ptr *buffer, CORBA::Boolean release) -+ : TAO_Unbounded_Object_Sequence (max, length, buffer, release) - {} --CORBA::PolicyList::PolicyList (const PolicyList &seq) // copy ctor -- : --#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -- _TAO_Unbounded_Object_Sequence_CORBA_PolicyList --#else /* TAO_USE_SEQUENCE_TEMPLATES */ -- TAO_Unbounded_Object_Sequence --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -- (seq) -+CORBA_PolicyList::CORBA_PolicyList (const CORBA_PolicyList &seq) // copy ctor -+ : TAO_Unbounded_Object_Sequence (seq) - {} --CORBA::PolicyList::~PolicyList (void) // dtor -+CORBA_PolicyList::~CORBA_PolicyList (void) // dtor - {} --void CORBA::PolicyList::_tao_any_destructor (void *x) --{ -- PolicyList *tmp = ACE_static_cast (PolicyList*,x); -- delete tmp; --} -- -- --#endif /* end #if !defined */ -- --static const CORBA::Long _oc_CORBA_PolicyList[] = --{ -- TAO_ENCAP_BYTE_ORDER, // byte order -- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyList:1.0 -- 11, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63794c69), ACE_NTOHL (0x73740000), // name = PolicyList -- CORBA::tk_sequence, // typecode kind -- 68, // encapsulation length -- TAO_ENCAP_BYTE_ORDER, // byte order -- CORBA::tk_objref, // typecode kind -- 52, // encapsulation length -- TAO_ENCAP_BYTE_ORDER, // byte order -- 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Policy:1.0 -- 7, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000), // name = Policy -- -- 0U, -- --}; --static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyList (CORBA::tk_alias, sizeof (_oc_CORBA_PolicyList), (char *) &_oc_CORBA_PolicyList, 0, sizeof (CORBA::PolicyList)); --TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) --TAO_NAMESPACE_BEGIN (CORBA) --TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyList, &_tc_TAO_tc_CORBA_PolicyList) --TAO_NAMESPACE_END -- --#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -- --#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CS_) --#define __TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CS_ -- -- void -- CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_allocate_buffer (CORBA::ULong length) -- { -- CORBA::ULong* tmp = 0; -- tmp = _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::allocbuf (length); -- -- if (this->buffer_ != 0) -- { -- CORBA::ULong *old = ACE_reinterpret_cast (CORBA::ULong *,this->buffer_); -- -- for (CORBA::ULong i = 0; i < this->length_; ++i) -- tmp[i] = old[i]; -- -- if (this->release_) -- _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (old); -- -- } -- this->buffer_ = tmp; -- } -- -- void -- CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::_deallocate_buffer (void) -- { -- if (this->buffer_ == 0 || this->release_ == 0) -- return; -- -- CORBA::ULong *tmp = ACE_reinterpret_cast (CORBA::ULong *,this->buffer_); -- -- _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::freebuf (tmp); -- this->buffer_ = 0; -- } -- -- CORBA::_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq::~_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void) // Dtor. -- { -- this->_deallocate_buffer (); -- } -- -- --#endif /* end #if !defined */ -- -- --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -- --#if !defined (_CORBA_POLICYTYPESEQ_CS_) --#define _CORBA_POLICYTYPESEQ_CS_ - - // ************************************************************* --// CORBA::PolicyTypeSeq -+// CORBA_PolicyTypeSeq - // ************************************************************* - --CORBA::PolicyTypeSeq::PolicyTypeSeq (void) -+CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (void) - {} --CORBA::PolicyTypeSeq::PolicyTypeSeq (CORBA::ULong max) // uses max size -- : --#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -- _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq --#else /* TAO_USE_SEQUENCE_TEMPLATES */ -- TAO_Unbounded_Sequence --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -+CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (CORBA::ULong max) // uses max size -+ : TAO_Unbounded_Sequence - (max) - {} --CORBA::PolicyTypeSeq::PolicyTypeSeq (CORBA::ULong max, CORBA::ULong length, CORBA::ULong *buffer, CORBA::Boolean release) -- : --#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -- _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq --#else /* TAO_USE_SEQUENCE_TEMPLATES */ -- TAO_Unbounded_Sequence --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -- (max, length, buffer, release) -+CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (CORBA::ULong max, CORBA::ULong length, CORBA::ULong *buffer, CORBA::Boolean release) -+ : TAO_Unbounded_Sequence (max, length, buffer, release) - {} --CORBA::PolicyTypeSeq::PolicyTypeSeq (const PolicyTypeSeq &seq) // copy ctor -- : --#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -- _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq --#else /* TAO_USE_SEQUENCE_TEMPLATES */ -- TAO_Unbounded_Sequence --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -- (seq) -+CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (const CORBA_PolicyTypeSeq &seq) -+ : TAO_Unbounded_Sequence (seq) - {} --CORBA::PolicyTypeSeq::~PolicyTypeSeq (void) // dtor -+CORBA_PolicyTypeSeq::~CORBA_PolicyTypeSeq (void) - {} --void CORBA::PolicyTypeSeq::_tao_any_destructor (void *x) --{ -- PolicyTypeSeq *tmp = ACE_static_cast (PolicyTypeSeq*,x); -- delete tmp; --} -- - --#endif /* end #if !defined */ -+// **************************************************************** - --static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] = --{ -- TAO_ENCAP_BYTE_ORDER, // byte order -- 36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x54797065), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/PolicyTypeSeq:1.0 -- 14, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795479), ACE_NTOHL (0x70655365), ACE_NTOHL (0x71000000), // name = PolicyTypeSeq -- CORBA::tk_sequence, // typecode kind -- 80, // encapsulation length -- TAO_ENCAP_BYTE_ORDER, // byte order -- 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 (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x54797065), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/PolicyType:1.0 -- 11, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795479), ACE_NTOHL (0x70650000), // name = PolicyType -- CORBA::tk_ulong, -- -- -- 0U, -- --}; --static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyTypeSeq (CORBA::tk_alias, sizeof (_oc_CORBA_PolicyTypeSeq), (char *) &_oc_CORBA_PolicyTypeSeq, 0, sizeof (CORBA::PolicyTypeSeq)); --TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) --TAO_NAMESPACE_BEGIN (CORBA) --TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyTypeSeq, &_tc_TAO_tc_CORBA_PolicyTypeSeq) --TAO_NAMESPACE_END --static const CORBA::Long _oc_CORBA_SetOverrideType[] = -+CORBA::PolicyManager_ptr CORBA_PolicyManager::_narrow ( -+ CORBA::Object_ptr obj, -+ CORBA::Environment &ACE_TRY_ENV -+ ) - { -- TAO_ENCAP_BYTE_ORDER, // byte order -- 38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5365), ACE_NTOHL (0x744f7665), ACE_NTOHL (0x72726964), ACE_NTOHL (0x65547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/SetOverrideType:1.0 -- 16, ACE_NTOHL (0x5365744f), ACE_NTOHL (0x76657272), ACE_NTOHL (0x69646554), ACE_NTOHL (0x79706500), // name = SetOverrideType -- 2, // member count -- 13, ACE_NTOHL (0x5345545f), ACE_NTOHL (0x4f564552), ACE_NTOHL (0x52494445), ACE_NTOHL (0x0), // name = SET_OVERRIDE -- 13, ACE_NTOHL (0x4144445f), ACE_NTOHL (0x4f564552), ACE_NTOHL (0x52494445), ACE_NTOHL (0x0), // name = ADD_OVERRIDE --}; --static CORBA::TypeCode _tc_TAO_tc_CORBA_SetOverrideType (CORBA::tk_enum, sizeof (_oc_CORBA_SetOverrideType), (char *) &_oc_CORBA_SetOverrideType, 0, sizeof (CORBA::SetOverrideType)); --TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) --TAO_NAMESPACE_BEGIN (CORBA) --TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SetOverrideType, &_tc_TAO_tc_CORBA_SetOverrideType) --TAO_NAMESPACE_END -- --// default constructor --CORBA::PolicyManager::PolicyManager (void) --{} -+ if (CORBA::is_nil (obj)) -+ return CORBA_PolicyManager::_nil (); -+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/PolicyManager:1.0", ACE_TRY_ENV); -+ ACE_CHECK_RETURN (CORBA_PolicyManager::_nil ()); -+ if (is_a == 0) -+ return CORBA_PolicyManager::_nil (); -+ void* servant = 0; -+ if (!obj->_is_collocated () || !obj->_servant() || -+ (servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/PolicyManager:1.0")) == 0) -+ ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA_PolicyManager::_nil ()); -+ -+ CORBA::PolicyManager_ptr retval = -+ CORBA_PolicyManager::_nil (); -+ -+ ACE_NEW_RETURN ( -+ retval, -+ POA_CORBA::_tao_collocated_PolicyManager ( -+ ACE_reinterpret_cast (POA_CORBA::PolicyManager_ptr, -+ servant), -+ 0 -+ ), -+ CORBA_PolicyManager::_nil () -+ ); - --// destructor --CORBA::PolicyManager::~PolicyManager (void) --{} -+ return retval; -+} - --void CORBA::PolicyManager::_tao_any_destructor (void *x) -+CORBA_PolicyList * CORBA_PolicyManager::get_policy_overrides ( -+ const CORBA_PolicyTypeSeq & ts, -+ CORBA::Environment &ACE_TRY_ENV -+ ) - { -- PolicyManager *tmp = ACE_static_cast (PolicyManager*,x); -- CORBA::release (tmp); -+ CORBA_PolicyList* _tao_retval = 0; -+ ACE_UNUSED_ARG (_tao_retval); -+ ACE_UNUSED_ARG (ts); -+ ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval); - } - --CORBA::PolicyManager_ptr CORBA::PolicyManager::_narrow ( -- CORBA::Object_ptr obj, -+void CORBA_PolicyManager::set_policy_overrides ( -+ const CORBA_PolicyList & policies, -+ CORBA::SetOverrideType set_add, - CORBA::Environment &ACE_TRY_ENV - ) - { -- if (CORBA::is_nil (obj)) -- return PolicyManager::_nil (); -- if (! obj->_is_local ()) -- { -- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/PolicyManager:1.0", ACE_TRY_ENV); -- ACE_CHECK_RETURN (PolicyManager::_nil ()); -- if (is_a == 0) -- return PolicyManager::_nil (); -- } -- return PolicyManager::_unchecked_narrow (obj, ACE_TRY_ENV); -+ ACE_UNUSED_ARG (policies); -+ ACE_UNUSED_ARG (set_add); -+ -+ ACE_THROW (CORBA::MARSHAL ()); - } - --CORBA::PolicyManager_ptr CORBA::PolicyManager::_unchecked_narrow ( -- CORBA::Object_ptr obj, -- CORBA::Environment & -- ) -+CORBA::Boolean CORBA_PolicyManager::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) - { -- if (CORBA::is_nil (obj)) -- return PolicyManager::_nil (); -- if (! obj->_is_local ()) -- { -- TAO_Stub* stub = obj->_stubobj (); -- if (stub) -- stub->_incr_refcnt (); -- PolicyManager_ptr default_proxy = PolicyManager::_nil (); -- -- if (obj->_is_collocated () && _TAO_collocation_CORBA_PolicyManager_Stub_Factory_function_pointer != 0) -- { -- default_proxy = _TAO_collocation_CORBA_PolicyManager_Stub_Factory_function_pointer (obj); -- } -- if (CORBA::is_nil (default_proxy)) -- ACE_NEW_RETURN (default_proxy, PolicyManager (stub), PolicyManager::_nil ()); -- #if (TAO_HAS_SMART_PROXIES == 1) -- return TAO_CORBA_PolicyManager_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy); -- #else -- return default_proxy; -- #endif /*TAO_HAS_SMART_PROXIES == 1*/ -- } -- else -- return -- ACE_reinterpret_cast -- ( -- PolicyManager_ptr, -- obj->_tao_QueryInterface -- ( -- ACE_reinterpret_cast -- ( -- ptr_arith_t, -- &PolicyManager::_narrow -- ) -- ) -- ); -+ if ( -+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PolicyManager: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); // remote call - } - --CORBA::PolicyManager_ptr --CORBA::PolicyManager::_duplicate (PolicyManager_ptr obj) -+const char* CORBA_PolicyManager::_interface_repository_id (void) const - { -- if (!CORBA::is_nil (obj)) -- obj->_add_ref (); -- return obj; -+ return "IDL:omg.org/CORBA/PolicyManager:1.0"; - } - --CORBA::PolicyList * CORBA::PolicyManager::get_policy_overrides ( -- const CORBA::PolicyTypeSeq & ts, -+// **************************************************************** -+ -+ -+CORBA_PolicyCurrent_ptr CORBA_PolicyCurrent::_narrow ( -+ CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV - ) -- ACE_THROW_SPEC (( -- CORBA::SystemException -- )) --{ -- -- CORBA::PolicyList *_tao_retval = 0; -- -- -- TAO_Stub *istub = this->_stubobj (); -- if (istub == 0) -- ACE_THROW_RETURN (CORBA::INTERNAL (), 0); -- -- -- ACE_NEW_RETURN (_tao_retval, CORBA::PolicyList, _tao_retval); -- CORBA::PolicyList_var _tao_safe_retval (_tao_retval); -- TAO_GIOP_Twoway_Invocation _tao_call ( -- istub, -- "get_policy_overrides", -- 20, -- istub->orb_core () -- ); -- --#if (TAO_HAS_INTERCEPTORS == 1) -- TAO_ClientRequestInterceptor_Adapter -- _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); -- ACE_CHECK_RETURN (0); -- PortableInterceptor::Cookies _tao_cookies; -- CORBA::NVList_var _tao_interceptor_args; -- if (_tao_vfr.valid ()) -- { -- istub->orb_core ()->orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); -- ACE_CHECK_RETURN (0); -- } -- -- ACE_TRY -- { --#endif /* TAO_HAS_INTERCEPTORS */ -- -- for (;;) -- { -- _tao_call.start (ACE_TRY_ENV); -- TAO_INTERCEPTOR_CHECK_RETURN (0); -- -- TAO_INTERCEPTOR ( -- _tao_vfr.preinvoke ( -- _tao_call.request_id (), -- 1, -- this, -- "get_policy_overrides", -- _tao_call.service_info (), -- _tao_interceptor_args.inout (), -- _tao_cookies, -- ACE_TRY_ENV -- ) -- ); -- TAO_INTERCEPTOR_CHECK_RETURN (0); -- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; -- -- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); -- TAO_INTERCEPTOR_CHECK_RETURN (0); -- -- TAO_OutputCDR &_tao_out = _tao_call.out_stream (); -- if (!( -- (_tao_out << ts) -- )) -- TAO_INTERCEPTOR_THROW_RETURN (CORBA::MARSHAL (), 0); -- -- int _invoke_status = -- _tao_call.invoke (0, 0, ACE_TRY_ENV); -- TAO_INTERCEPTOR_CHECK_RETURN (0); -- -- if (_invoke_status == TAO_INVOKE_RESTART) -- continue; -- if (_invoke_status != TAO_INVOKE_OK) -- { -- TAO_INTERCEPTOR_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0); -- -- } -- TAO_InputCDR &_tao_in = _tao_call.inp_stream (); -- if (!( -- (_tao_in >> _tao_safe_retval.inout ()) -- )) -- TAO_INTERCEPTOR_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0); -- -- TAO_INTERCEPTOR ( -- _tao_vfr.postinvoke ( -- _tao_call.request_id (), -- 1, -- this, -- "get_policy_overrides", -- _tao_call.service_info (), -- _tao_interceptor_args.inout (), -- _tao_cookies, -- ACE_TRY_ENV -- ) -- ); -- TAO_INTERCEPTOR_CHECK_RETURN (0); -- break; -- -- } --#if (TAO_HAS_INTERCEPTORS == 1) -- -- } -- ACE_CATCHANY -- { -- _tao_vfr.exception_occurred ( -- _tao_call.request_id (), -- 1, -- this, -- "get_policy_overrides", -- _tao_cookies, -- ACE_TRY_ENV -- ); -- ACE_RETHROW; -- } -- ACE_ENDTRY; -- ACE_CHECK_RETURN (0); --#endif /* TAO_HAS_INTERCEPTORS */ -- return _tao_safe_retval._retn (); --} -- --void CORBA::PolicyManager::set_policy_overrides ( -- const CORBA::PolicyList & policies, -- CORBA::SetOverrideType set_add, -- CORBA::Environment &ACE_TRY_ENV -- ) -- ACE_THROW_SPEC (( -- CORBA::SystemException, -- CORBA::InvalidPolicies -- )) --{ -- -- static TAO_Exception_Data _tao_CORBA_PolicyManager_set_policy_overrides_exceptiondata [] = -- { -- {CORBA::_tc_InvalidPolicies, CORBA::InvalidPolicies::_alloc} -- }; -- -- -- -- -- TAO_Stub *istub = this->_stubobj (); -- if (istub == 0) -- ACE_THROW (CORBA::INTERNAL ()); -- -- -- TAO_GIOP_Twoway_Invocation _tao_call ( -- istub, -- "set_policy_overrides", -- 20, -- istub->orb_core () -- ); -- --#if (TAO_HAS_INTERCEPTORS == 1) -- TAO_ClientRequestInterceptor_Adapter -- _tao_vfr (istub->orb_core ()->orb ()->_get_client_interceptor (ACE_TRY_ENV)); -- ACE_CHECK; -- PortableInterceptor::Cookies _tao_cookies; -- CORBA::NVList_var _tao_interceptor_args; -- if (_tao_vfr.valid ()) -- { -- istub->orb_core ()->orb ()->create_list (0, _tao_interceptor_args.inout (), ACE_TRY_ENV); -- ACE_CHECK; -- } -- -- ACE_TRY -- { --#endif /* TAO_HAS_INTERCEPTORS */ -- -- for (;;) -- { -- _tao_call.start (ACE_TRY_ENV); -- TAO_INTERCEPTOR_CHECK; -- -- TAO_INTERCEPTOR ( -- _tao_vfr.preinvoke ( -- _tao_call.request_id (), -- 1, -- this, -- "set_policy_overrides", -- _tao_call.service_info (), -- _tao_interceptor_args.inout (), -- _tao_cookies, -- ACE_TRY_ENV -- ) -- ); -- TAO_INTERCEPTOR_CHECK; -- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG; -- -- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV); -- TAO_INTERCEPTOR_CHECK; -- -- TAO_OutputCDR &_tao_out = _tao_call.out_stream (); -- if (!( -- (_tao_out << policies) && -- (_tao_out << set_add) -- )) -- TAO_INTERCEPTOR_THROW (CORBA::MARSHAL ()); -- int _invoke_status = -- _tao_call.invoke (_tao_CORBA_PolicyManager_set_policy_overrides_exceptiondata, 1, ACE_TRY_ENV); -- TAO_INTERCEPTOR_CHECK; -- -- if (_invoke_status == TAO_INVOKE_RESTART) -- continue; -- if (_invoke_status != TAO_INVOKE_OK) -- { -- TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); -- } -- -- TAO_INTERCEPTOR ( -- _tao_vfr.postinvoke ( -- _tao_call.request_id (), -- 1, -- this, -- "set_policy_overrides", -- _tao_call.service_info (), -- _tao_interceptor_args.inout (), -- _tao_cookies, -- ACE_TRY_ENV -- ) -- ); -- TAO_INTERCEPTOR_CHECK; -- break; -- -- } --#if (TAO_HAS_INTERCEPTORS == 1) -- -- } -- ACE_CATCHANY -- { -- _tao_vfr.exception_occurred ( -- _tao_call.request_id (), -- 1, -- this, -- "set_policy_overrides", -- _tao_cookies, -- ACE_TRY_ENV -- ); -- ACE_RETHROW; -- } -- ACE_ENDTRY; -- ACE_CHECK; --#endif /* TAO_HAS_INTERCEPTORS */ -+{ -+ if (CORBA::is_nil (obj)) -+ return CORBA_PolicyCurrent::_nil (); -+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/PolicyCurrent:1.0", ACE_TRY_ENV); -+ ACE_CHECK_RETURN (CORBA_PolicyCurrent::_nil ()); -+ if (is_a == 0) -+ return CORBA_PolicyCurrent::_nil (); -+ void* servant = 0; -+ if (!obj->_is_collocated () || !obj->_servant() || -+ (servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/PolicyCurrent:1.0")) == 0) -+ ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA_PolicyCurrent::_nil ()); -+ -+ CORBA_PolicyCurrent_ptr retval = -+ CORBA_PolicyCurrent::_nil (); -+ -+ ACE_NEW_RETURN ( -+ retval, -+ POA_CORBA::_tao_collocated_PolicyCurrent ( -+ ACE_reinterpret_cast (POA_CORBA::PolicyCurrent_ptr, -+ servant), -+ 0 -+ ), -+ CORBA_PolicyCurrent::_nil () -+ ); - -+ return retval; - } - --CORBA::Boolean CORBA::PolicyManager::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) -+CORBA::Boolean CORBA_PolicyCurrent::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) - { - if ( -+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PolicyCurrent:1.0")) || - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PolicyManager: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 *CORBA::PolicyManager::_tao_QueryInterface (ptr_arith_t type) --{ -- void *retv = 0; -- if (type == ACE_reinterpret_cast -- (ptr_arith_t, -- &ACE_NESTED_CLASS (::CORBA, PolicyManager)::_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::PolicyManager::_interface_repository_id (void) const --{ -- return "IDL:omg.org/CORBA/PolicyManager:1.0"; --} -- --static const CORBA::Long _oc_CORBA_PolicyManager[] = --{ -- TAO_ENCAP_BYTE_ORDER, // byte order -- 36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x4d616e61), ACE_NTOHL (0x6765723a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/PolicyManager:1.0 -- 14, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63794d61), ACE_NTOHL (0x6e616765), ACE_NTOHL (0x72000000), // name = PolicyManager --}; --static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyManager (CORBA::tk_objref, sizeof (_oc_CORBA_PolicyManager), (char *) &_oc_CORBA_PolicyManager, 0, sizeof (CORBA::PolicyManager)); --TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) --TAO_NAMESPACE_BEGIN (CORBA) --TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyManager, &_tc_TAO_tc_CORBA_PolicyManager) --TAO_NAMESPACE_END -- --// default constructor --CORBA::Current::Current (void) --{} -- --// destructor --CORBA::Current::~Current (void) --{} -- --void CORBA::Current::_tao_any_destructor (void *x) --{ -- Current *tmp = ACE_static_cast (Current*,x); -- CORBA::release (tmp); --} -- --CORBA::Current_ptr CORBA::Current::_narrow ( -- CORBA::Object_ptr obj, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- if (CORBA::is_nil (obj)) -- return Current::_nil (); -- if (! obj->_is_local ()) -- { -- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Current:1.0", ACE_TRY_ENV); -- ACE_CHECK_RETURN (Current::_nil ()); -- if (is_a == 0) -- return Current::_nil (); -- } -- return Current::_unchecked_narrow (obj, ACE_TRY_ENV); --} -- --CORBA::Current_ptr CORBA::Current::_unchecked_narrow ( -- CORBA::Object_ptr obj, -- CORBA::Environment & -- ) --{ -- if (CORBA::is_nil (obj)) -- return Current::_nil (); -- if (! obj->_is_local ()) -- { -- TAO_Stub* stub = obj->_stubobj (); -- if (stub) -- stub->_incr_refcnt (); -- Current_ptr default_proxy = Current::_nil (); -- -- if (obj->_is_collocated () && _TAO_collocation_CORBA_Current_Stub_Factory_function_pointer != 0) -- { -- default_proxy = _TAO_collocation_CORBA_Current_Stub_Factory_function_pointer (obj); -- } -- if (CORBA::is_nil (default_proxy)) -- ACE_NEW_RETURN (default_proxy, Current (stub), Current::_nil ()); -- #if (TAO_HAS_SMART_PROXIES == 1) -- return TAO_CORBA_Current_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy); -- #else -- return default_proxy; -- #endif /*TAO_HAS_SMART_PROXIES == 1*/ -- } -- else -- return -- ACE_reinterpret_cast -- ( -- Current_ptr, -- obj->_tao_QueryInterface -- ( -- ACE_reinterpret_cast -- ( -- ptr_arith_t, -- &Current::_narrow -- ) -- ) -- ); --} -- --CORBA::Current_ptr --CORBA::Current::_duplicate (Current_ptr obj) --{ -- if (!CORBA::is_nil (obj)) -- obj->_add_ref (); -- return obj; --} -- --CORBA::Boolean CORBA::Current::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) --{ -- if ( - (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Current: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 *CORBA::Current::_tao_QueryInterface (ptr_arith_t type) --{ -- void *retv = 0; -- if (type == ACE_reinterpret_cast -- (ptr_arith_t, -- &ACE_NESTED_CLASS (::CORBA, Current)::_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::Current::_interface_repository_id (void) const --{ -- return "IDL:omg.org/CORBA/Current:1.0"; --} -- --static const CORBA::Long _oc_CORBA_Current[] = --{ -- TAO_ENCAP_BYTE_ORDER, // byte order -- 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4375), ACE_NTOHL (0x7272656e), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/CORBA/Current:1.0 -- 8, ACE_NTOHL (0x43757272), ACE_NTOHL (0x656e7400), // name = Current --}; --static CORBA::TypeCode _tc_TAO_tc_CORBA_Current (CORBA::tk_objref, sizeof (_oc_CORBA_Current), (char *) &_oc_CORBA_Current, 0, sizeof (CORBA::Current)); --TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) --TAO_NAMESPACE_BEGIN (CORBA) --TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Current, &_tc_TAO_tc_CORBA_Current) --TAO_NAMESPACE_END -- --// default constructor --CORBA::PolicyCurrent::PolicyCurrent (void) --{} -- --// destructor --CORBA::PolicyCurrent::~PolicyCurrent (void) --{} -- --void CORBA::PolicyCurrent::_tao_any_destructor (void *x) --{ -- PolicyCurrent *tmp = ACE_static_cast (PolicyCurrent*,x); -- CORBA::release (tmp); --} -- --CORBA::PolicyCurrent_ptr CORBA::PolicyCurrent::_narrow ( -- CORBA::Object_ptr obj, -- CORBA::Environment &ACE_TRY_ENV -- ) --{ -- if (CORBA::is_nil (obj)) -- return PolicyCurrent::_nil (); -- if (! obj->_is_local ()) -- { -- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/PolicyCurrent:1.0", ACE_TRY_ENV); -- ACE_CHECK_RETURN (PolicyCurrent::_nil ()); -- if (is_a == 0) -- return PolicyCurrent::_nil (); -- } -- return PolicyCurrent::_unchecked_narrow (obj, ACE_TRY_ENV); -+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV); // remote call - } - --CORBA::PolicyCurrent_ptr CORBA::PolicyCurrent::_unchecked_narrow ( -- CORBA::Object_ptr obj, -- CORBA::Environment & -- ) -+const char* CORBA_PolicyCurrent::_interface_repository_id (void) const - { -- if (CORBA::is_nil (obj)) -- return PolicyCurrent::_nil (); -- if (! obj->_is_local ()) -- { -- TAO_Stub* stub = obj->_stubobj (); -- if (stub) -- stub->_incr_refcnt (); -- PolicyCurrent_ptr default_proxy = PolicyCurrent::_nil (); -- -- if (obj->_is_collocated () && _TAO_collocation_CORBA_PolicyCurrent_Stub_Factory_function_pointer != 0) -- { -- default_proxy = _TAO_collocation_CORBA_PolicyCurrent_Stub_Factory_function_pointer (obj); -- } -- if (CORBA::is_nil (default_proxy)) -- ACE_NEW_RETURN (default_proxy, PolicyCurrent (stub), PolicyCurrent::_nil ()); -- #if (TAO_HAS_SMART_PROXIES == 1) -- return TAO_CORBA_PolicyCurrent_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy); -- #else -- return default_proxy; -- #endif /*TAO_HAS_SMART_PROXIES == 1*/ -- } -- else -- return -- ACE_reinterpret_cast -- ( -- PolicyCurrent_ptr, -- obj->_tao_QueryInterface -- ( -- ACE_reinterpret_cast -- ( -- ptr_arith_t, -- &PolicyCurrent::_narrow -- ) -- ) -- ); -+ return "IDL:omg.org/CORBA/PolicyCurrent:1.0"; - } - --CORBA::PolicyCurrent_ptr --CORBA::PolicyCurrent::_duplicate (PolicyCurrent_ptr obj) --{ -- if (!CORBA::is_nil (obj)) -- obj->_add_ref (); -- return obj; --} -+// **************************************************************** - --CORBA::Boolean CORBA::PolicyCurrent::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) --{ -- if ( -- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PolicyCurrent:1.0")) || -- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PolicyManager:1.0")) || -- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Current: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 *CORBA::PolicyCurrent::_tao_QueryInterface (ptr_arith_t type) -+void operator<<= (CORBA::Any &_tao_any, const CORBA::PolicyError &_tao_elem) // copying - { -- void *retv = 0; -- if (type == ACE_reinterpret_cast -- (ptr_arith_t, -- &ACE_NESTED_CLASS (::CORBA, PolicyCurrent)::_narrow)) -- retv = ACE_reinterpret_cast (void*, this); -- else if (type == ACE_reinterpret_cast -- (ptr_arith_t, -- &ACE_NESTED_CLASS (::CORBA, PolicyManager)::_narrow)) -- retv = ACE_reinterpret_cast -- ( -- void *, -- ACE_static_cast -- ( -- CORBA::PolicyManager_ptr, -- this -- ) -- ); -- else if (type == ACE_reinterpret_cast -- (ptr_arith_t, -- &ACE_NESTED_CLASS (::CORBA, Current)::_narrow)) -- retv = ACE_reinterpret_cast -- ( -- void *, -- ACE_static_cast -- ( -- CORBA::Current_ptr, -- this -- ) -+ TAO_OutputCDR stream; -+ stream << _tao_elem; -+ _tao_any._tao_replace ( -+ CORBA::_tc_PolicyError, -+ TAO_ENCAP_BYTE_ORDER, -+ stream.begin () - ); -- 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::PolicyCurrent::_interface_repository_id (void) const --{ -- return "IDL:omg.org/CORBA/PolicyCurrent:1.0"; - } - --static const CORBA::Long _oc_CORBA_PolicyCurrent[] = --{ -- TAO_ENCAP_BYTE_ORDER, // byte order -- 36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x43757272), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/CORBA/PolicyCurrent:1.0 -- 14, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63794375), ACE_NTOHL (0x7272656e), ACE_NTOHL (0x74000000), // name = PolicyCurrent --}; --static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyCurrent (CORBA::tk_objref, sizeof (_oc_CORBA_PolicyCurrent), (char *) &_oc_CORBA_PolicyCurrent, 0, sizeof (CORBA::PolicyCurrent)); --TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr) --TAO_NAMESPACE_BEGIN (CORBA) --TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyCurrent, &_tc_TAO_tc_CORBA_PolicyCurrent) --TAO_NAMESPACE_END --void operator<<= (CORBA::Any &_tao_any, const CORBA::PolicyError &_tao_elem) // copying -+void CORBA::PolicyError::_tao_any_destructor (void *x) - { -- TAO_OutputCDR stream; -- stream << _tao_elem; -- _tao_any._tao_replace ( -- CORBA::_tc_PolicyError, -- TAO_ENCAP_BYTE_ORDER, -- stream.begin () -- ); -+ CORBA::PolicyError *tmp = ACE_static_cast(CORBA::PolicyError*,x); -+ delete tmp; - } - - void operator<<= (CORBA::Any &_tao_any, CORBA::PolicyError *_tao_elem) // non copying - { -- TAO_OutputCDR stream; -- stream << *_tao_elem; -- _tao_any._tao_replace ( -- CORBA::_tc_PolicyError, -- TAO_ENCAP_BYTE_ORDER, -- stream.begin (), -- 1, -- _tao_elem, -- CORBA::PolicyError::_tao_any_destructor -- ); -+ TAO_OutputCDR stream; -+ stream << *_tao_elem; -+ _tao_any._tao_replace ( -+ CORBA::_tc_PolicyError, -+ TAO_ENCAP_BYTE_ORDER, -+ stream.begin (), -+ 1, -+ _tao_elem, -+ CORBA::PolicyError::_tao_any_destructor -+ ); - } - - CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PolicyError *&_tao_elem) - { -- return _tao_any >>= ACE_const_cast( -- const CORBA::PolicyError*&, -- _tao_elem -- ); -+ ACE_TRY_NEW_ENV -+ { -+ CORBA::TypeCode_var type = _tao_any.type (); -+ if (!type->equivalent (CORBA::_tc_PolicyError, ACE_TRY_ENV)) // not equal -+ { -+ _tao_elem = 0; -+ return 0; -+ } -+ ACE_TRY_CHECK; -+ if (_tao_any.any_owns_data ()) -+ { -+ _tao_elem = (CORBA::PolicyError *)_tao_any.value (); -+ return 1; -+ } -+ else -+ { -+ ACE_NEW_RETURN (_tao_elem, CORBA::PolicyError, 0); -+ TAO_InputCDR stream ( -+ _tao_any._tao_get_cdr (), -+ _tao_any._tao_byte_order () -+ ); -+ if (stream >> *_tao_elem) -+ { -+ ((CORBA::Any *)&_tao_any)->_tao_replace ( -+ CORBA::_tc_PolicyError, -+ 1, -+ ACE_reinterpret_cast (void *, _tao_elem), -+ CORBA::PolicyError::_tao_any_destructor -+ ); -+ return 1; -+ } -+ else -+ { -+ delete _tao_elem; -+ _tao_elem = 0; -+ } -+ } -+ } -+ ACE_CATCHANY -+ { -+ delete _tao_elem; -+ _tao_elem = 0; -+ return 0; -+ } -+ ACE_ENDTRY; -+ return 0; - } - - CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyError *&_tao_elem) - { -- _tao_elem = 0; - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (CORBA::_tc_PolicyError, ACE_TRY_ENV)) // not equal - { -+ _tao_elem = 0; - return 0; - } - ACE_TRY_CHECK; -@@ -1819,38 +723,33 @@ - } - else - { -- CORBA::PolicyError *tmp; -- ACE_NEW_RETURN (tmp, CORBA::PolicyError, 0); -+ ACE_NEW_RETURN (_tao_elem, CORBA::PolicyError, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); -- CORBA::String_var interface_repository_id; -- if (!(stream >> interface_repository_id.out ())) -- return 0; -- if (ACE_OS::strcmp ( -- interface_repository_id.in (), -- "IDL:omg.org/CORBA/PolicyError:1.0")) -- return 0; -- if (stream >> *tmp) -+ if (stream >> *(CORBA::PolicyError *)_tao_elem) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - CORBA::_tc_PolicyError, - 1, -- tmp, -+ ACE_reinterpret_cast (void *, ACE_const_cast (CORBA::PolicyError *&, _tao_elem)), - CORBA::PolicyError::_tao_any_destructor - ); -- _tao_elem = tmp; - return 1; - } - else - { -- delete tmp; -+ delete ACE_const_cast (CORBA::PolicyError *&, _tao_elem); -+ _tao_elem = 0; - } - } - } - ACE_CATCHANY - { -+ delete ACE_const_cast (CORBA::PolicyError *&, _tao_elem); -+ _tao_elem = 0; -+ return 0; - } - ACE_ENDTRY; - return 0; -@@ -1858,45 +757,93 @@ - - void operator<<= (CORBA::Any &_tao_any, const CORBA::InvalidPolicies &_tao_elem) // copying - { -- TAO_OutputCDR stream; -- stream << _tao_elem; -- _tao_any._tao_replace ( -- CORBA::_tc_InvalidPolicies, -- TAO_ENCAP_BYTE_ORDER, -- stream.begin () -- ); -+ TAO_OutputCDR stream; -+ stream << _tao_elem; -+ _tao_any._tao_replace ( -+ CORBA::_tc_InvalidPolicies, -+ TAO_ENCAP_BYTE_ORDER, -+ stream.begin () -+ ); -+} -+ -+void CORBA::InvalidPolicies::_tao_any_destructor (void *x) -+{ -+ CORBA::InvalidPolicies *tmp = ACE_static_cast(CORBA::InvalidPolicies*,x); -+ delete tmp; - } - - void operator<<= (CORBA::Any &_tao_any, CORBA::InvalidPolicies *_tao_elem) // non copying - { -- TAO_OutputCDR stream; -- stream << *_tao_elem; -- _tao_any._tao_replace ( -- CORBA::_tc_InvalidPolicies, -- TAO_ENCAP_BYTE_ORDER, -- stream.begin (), -- 1, -- _tao_elem, -- CORBA::InvalidPolicies::_tao_any_destructor -- ); -+ TAO_OutputCDR stream; -+ stream << *_tao_elem; -+ _tao_any._tao_replace ( -+ CORBA::_tc_InvalidPolicies, -+ TAO_ENCAP_BYTE_ORDER, -+ stream.begin (), -+ 1, -+ _tao_elem, -+ CORBA::InvalidPolicies::_tao_any_destructor -+ ); - } - - CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::InvalidPolicies *&_tao_elem) - { -- return _tao_any >>= ACE_const_cast( -- const CORBA::InvalidPolicies*&, -- _tao_elem -- ); -+ ACE_TRY_NEW_ENV -+ { -+ CORBA::TypeCode_var type = _tao_any.type (); -+ if (!type->equivalent (CORBA::_tc_InvalidPolicies, ACE_TRY_ENV)) // not equal -+ { -+ _tao_elem = 0; -+ return 0; -+ } -+ ACE_TRY_CHECK; -+ if (_tao_any.any_owns_data ()) -+ { -+ _tao_elem = (CORBA::InvalidPolicies *)_tao_any.value (); -+ return 1; -+ } -+ else -+ { -+ ACE_NEW_RETURN (_tao_elem, CORBA::InvalidPolicies, 0); -+ TAO_InputCDR stream ( -+ _tao_any._tao_get_cdr (), -+ _tao_any._tao_byte_order () -+ ); -+ if (stream >> *_tao_elem) -+ { -+ ((CORBA::Any *)&_tao_any)->_tao_replace ( -+ CORBA::_tc_InvalidPolicies, -+ 1, -+ ACE_reinterpret_cast (void *, _tao_elem), -+ CORBA::InvalidPolicies::_tao_any_destructor -+ ); -+ return 1; -+ } -+ else -+ { -+ delete _tao_elem; -+ _tao_elem = 0; -+ } -+ } -+ } -+ ACE_CATCHANY -+ { -+ delete _tao_elem; -+ _tao_elem = 0; -+ return 0; -+ } -+ ACE_ENDTRY; -+ return 0; - } - - CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::InvalidPolicies *&_tao_elem) - { -- _tao_elem = 0; - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (CORBA::_tc_InvalidPolicies, ACE_TRY_ENV)) // not equal - { -+ _tao_elem = 0; - return 0; - } - ACE_TRY_CHECK; -@@ -1907,278 +854,371 @@ - } - else - { -- CORBA::InvalidPolicies *tmp; -- ACE_NEW_RETURN (tmp, CORBA::InvalidPolicies, 0); -+ ACE_NEW_RETURN (_tao_elem, CORBA::InvalidPolicies, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); -- CORBA::String_var interface_repository_id; -- if (!(stream >> interface_repository_id.out ())) -- return 0; -- if (ACE_OS::strcmp ( -- interface_repository_id.in (), -- "IDL:omg.org/CORBA/InvalidPolicies:1.0")) -- return 0; -- if (stream >> *tmp) -+ if (stream >> *(CORBA::InvalidPolicies *)_tao_elem) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - CORBA::_tc_InvalidPolicies, - 1, -- tmp, -+ ACE_reinterpret_cast (void *, ACE_const_cast (CORBA::InvalidPolicies *&, _tao_elem)), - CORBA::InvalidPolicies::_tao_any_destructor - ); -- _tao_elem = tmp; - return 1; - } - else - { -- delete tmp; -+ delete ACE_const_cast (CORBA::InvalidPolicies *&, _tao_elem); -+ _tao_elem = 0; - } - } - } - ACE_CATCHANY - { -+ delete ACE_const_cast (CORBA::InvalidPolicies *&, _tao_elem); -+ _tao_elem = 0; -+ return 0; - } - ACE_ENDTRY; - return 0; - } - -+void CORBA::Policy::_tao_any_destructor (void *x) -+{ -+ CORBA::Policy *tmp = ACE_static_cast(CORBA::Policy*,x); -+ CORBA::release (tmp); -+} -+ - CORBA::Policy_ptr (*_TAO_collocation_CORBA_Policy_Stub_Factory_function_pointer) ( - CORBA::Object_ptr obj - ) = 0; - void operator<<= (CORBA::Any &_tao_any, CORBA::Policy_ptr _tao_elem) - { -- TAO_OutputCDR stream; -- if (stream << _tao_elem) -+ TAO_OutputCDR stream; -+ if (stream << _tao_elem) -+ { -+ _tao_any._tao_replace ( -+ CORBA::_tc_Policy, -+ TAO_ENCAP_BYTE_ORDER, -+ stream.begin (), -+ 1, -+ _tao_elem, -+ CORBA::Policy::_tao_any_destructor -+ ); -+ } -+} -+ -+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Policy_ptr &_tao_elem) -+{ -+ ACE_TRY_NEW_ENV -+ { -+ _tao_elem = CORBA::Policy::_nil (); -+ CORBA::TypeCode_var type = _tao_any.type (); -+ if (!type->equivalent (CORBA::_tc_Policy, ACE_TRY_ENV)) // not equal -+ { -+ return 0; -+ } -+ ACE_TRY_CHECK; -+ TAO_InputCDR stream ( -+ _tao_any._tao_get_cdr (), -+ _tao_any._tao_byte_order () -+ ); -+ CORBA::Object_var _tao_obj_var; -+ if (stream >> _tao_obj_var.out ()) -+ { -+ _tao_elem = CORBA::Policy::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); -+ ACE_TRY_CHECK; -+ ((CORBA::Any *)&_tao_any)->_tao_replace ( -+ CORBA::_tc_Policy, -+ 1, -+ _tao_elem, -+ CORBA::Policy::_tao_any_destructor -+ ); -+ return 1; -+ } -+ } -+ ACE_CATCHANY -+ { -+ _tao_elem = CORBA::Policy::_nil (); -+ return 0; -+ } -+ ACE_ENDTRY; -+ _tao_elem = CORBA::Policy::_nil (); -+ return 0; -+} -+ -+// **************************************************************** -+ -+void operator<<= ( -+ CORBA::Any &_tao_any, -+ const CORBA::PolicyList &_tao_elem -+ ) // copying -+{ -+ TAO_OutputCDR stream; -+ if (stream << _tao_elem) -+ { -+ _tao_any._tao_replace ( -+ CORBA::_tc_PolicyList, -+ TAO_ENCAP_BYTE_ORDER, -+ stream.begin () -+ ); -+ } -+} -+ -+void CORBA::PolicyList::_tao_any_destructor (void *x) -+{ -+ CORBA::PolicyList *tmp = ACE_static_cast(CORBA::PolicyList*,x); -+ delete tmp; -+} -+ -+void operator<<= (CORBA::Any &_tao_any, CORBA::PolicyList *_tao_elem) // non copying -+{ -+ TAO_OutputCDR stream; -+ stream << *_tao_elem; -+ _tao_any._tao_replace ( -+ CORBA::_tc_PolicyList, -+ TAO_ENCAP_BYTE_ORDER, -+ stream.begin (), -+ 1, -+ _tao_elem, -+ CORBA::PolicyList::_tao_any_destructor -+ ); -+} -+ -+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PolicyList *&_tao_elem) -+{ -+ ACE_TRY_NEW_ENV -+ { -+ CORBA::TypeCode_var type = _tao_any.type (); -+ if (!type->equivalent (CORBA::_tc_PolicyList, ACE_TRY_ENV)) // not equal -+ { -+ _tao_elem = 0; -+ return 0; -+ } -+ ACE_TRY_CHECK; -+ if (_tao_any.any_owns_data ()) -+ { -+ _tao_elem = (CORBA::PolicyList *)_tao_any.value (); -+ return 1; -+ } -+ else -+ { -+ ACE_NEW_RETURN (_tao_elem, CORBA::PolicyList, 0); -+ TAO_InputCDR stream ( -+ _tao_any._tao_get_cdr (), -+ _tao_any._tao_byte_order () -+ ); -+ if (stream >> *_tao_elem) -+ { -+ ((CORBA::Any *)&_tao_any)->_tao_replace ( -+ CORBA::_tc_PolicyList, -+ 1, -+ ACE_reinterpret_cast (void *, _tao_elem), -+ CORBA::PolicyList::_tao_any_destructor -+ ); -+ return 1; -+ } -+ else -+ { -+ delete _tao_elem; -+ _tao_elem = 0; -+ } -+ } -+ } -+ ACE_CATCHANY - { -- _tao_any._tao_replace ( -- CORBA::_tc_Policy, -- TAO_ENCAP_BYTE_ORDER, -- stream.begin (), -- 1, -- CORBA::Policy::_duplicate (_tao_elem), -- CORBA::Policy::_tao_any_destructor -- ); -+ delete _tao_elem; -+ _tao_elem = 0; -+ return 0; - } -+ ACE_ENDTRY; -+ return 0; - } - --CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Policy_ptr &_tao_elem) -+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyList *&_tao_elem) - { - ACE_TRY_NEW_ENV - { -- _tao_elem = CORBA::Policy::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); -- if (!type->equivalent (CORBA::_tc_Policy, ACE_TRY_ENV)) // not equal -+ if (!type->equivalent (CORBA::_tc_PolicyList, ACE_TRY_ENV)) // not equal - { -+ _tao_elem = 0; - return 0; - } - ACE_TRY_CHECK; -- TAO_InputCDR stream ( -- _tao_any._tao_get_cdr (), -- _tao_any._tao_byte_order () -- ); -- if (stream >> _tao_elem) -+ if (_tao_any.any_owns_data ()) - { -- ((CORBA::Any *)&_tao_any)->_tao_replace ( -- CORBA::_tc_Policy, -- 1, -- _tao_elem, -- CORBA::Policy::_tao_any_destructor -- ); -+ _tao_elem = (CORBA::PolicyList *)_tao_any.value (); - return 1; - } -+ else -+ { -+ ACE_NEW_RETURN (_tao_elem, CORBA::PolicyList, 0); -+ TAO_InputCDR stream ( -+ _tao_any._tao_get_cdr (), -+ _tao_any._tao_byte_order () -+ ); -+ if (stream >> *(CORBA::PolicyList *)_tao_elem) -+ { -+ ((CORBA::Any *)&_tao_any)->_tao_replace ( -+ CORBA::_tc_PolicyList, -+ 1, -+ ACE_reinterpret_cast (void *, ACE_const_cast (CORBA::PolicyList *&, _tao_elem)), -+ CORBA::PolicyList::_tao_any_destructor -+ ); -+ return 1; -+ } -+ else -+ { -+ delete ACE_const_cast (CORBA::PolicyList *&, _tao_elem); -+ _tao_elem = 0; -+ } -+ } - } - ACE_CATCHANY - { -- _tao_elem = CORBA::Policy::_nil (); -+ delete ACE_const_cast (CORBA::PolicyList *&, _tao_elem); -+ _tao_elem = 0; - return 0; - } - ACE_ENDTRY; -- _tao_elem = CORBA::Policy::_nil (); - return 0; - } - --#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ -- defined (ACE_HAS_GNU_REPO) -- template class TAO_Object_Manager; -- #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -- # pragma instantiate TAO_Object_Manager --#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -- - void operator<<= ( - CORBA::Any &_tao_any, -- const CORBA::PolicyList &_tao_elem -+ const CORBA::PolicyTypeSeq &_tao_elem - ) // copying - { -- TAO_OutputCDR stream; -- if (stream << _tao_elem) -- { -- _tao_any._tao_replace ( -- CORBA::_tc_PolicyList, -- TAO_ENCAP_BYTE_ORDER, -- stream.begin () -- ); -- } -+ TAO_OutputCDR stream; -+ if (stream << _tao_elem) -+ { -+ _tao_any._tao_replace ( -+ CORBA::_tc_PolicyTypeSeq, -+ TAO_ENCAP_BYTE_ORDER, -+ stream.begin () -+ ); -+ } - } - --void operator<<= (CORBA::Any &_tao_any, CORBA::PolicyList *_tao_elem) // non copying -+void CORBA::PolicyTypeSeq::_tao_any_destructor (void *x) - { -- TAO_OutputCDR stream; -- stream << *_tao_elem; -- _tao_any._tao_replace ( -- CORBA::_tc_PolicyList, -- TAO_ENCAP_BYTE_ORDER, -- stream.begin (), -- 1, -- _tao_elem, -- CORBA::PolicyList::_tao_any_destructor -- ); -+ CORBA::PolicyTypeSeq *tmp = ACE_static_cast(CORBA::PolicyTypeSeq*,x); -+ delete tmp; - } - --CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PolicyList *&_tao_elem) -+void operator<<= (CORBA::Any &_tao_any, CORBA::PolicyTypeSeq *_tao_elem) // non copying - { -- return _tao_any >>= ACE_const_cast( -- const CORBA::PolicyList*&, -- _tao_elem -- ); -+ TAO_OutputCDR stream; -+ stream << *_tao_elem; -+ _tao_any._tao_replace ( -+ CORBA::_tc_PolicyTypeSeq, -+ TAO_ENCAP_BYTE_ORDER, -+ stream.begin (), -+ 1, -+ _tao_elem, -+ CORBA::PolicyTypeSeq::_tao_any_destructor -+ ); - } - --CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyList *&_tao_elem) -+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PolicyTypeSeq *&_tao_elem) - { -- _tao_elem = 0; - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); -- if (!type->equivalent (CORBA::_tc_PolicyList, ACE_TRY_ENV)) // not equal -+ if (!type->equivalent (CORBA::_tc_PolicyTypeSeq, ACE_TRY_ENV)) // not equal - { -+ _tao_elem = 0; - return 0; - } - ACE_TRY_CHECK; - if (_tao_any.any_owns_data ()) - { -- _tao_elem = ACE_static_cast( -- const CORBA::PolicyList*, -- _tao_any.value () -- ); -+ _tao_elem = (CORBA::PolicyTypeSeq *)_tao_any.value (); - return 1; - } - else - { -- CORBA::PolicyList *tmp; -- ACE_NEW_RETURN (tmp, CORBA::PolicyList, 0); -+ ACE_NEW_RETURN (_tao_elem, CORBA::PolicyTypeSeq, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); -- if (stream >> *tmp) -+ if (stream >> *_tao_elem) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( -- CORBA::_tc_PolicyList, -+ CORBA::_tc_PolicyTypeSeq, - 1, -- ACE_static_cast (void *, tmp), -- CORBA::PolicyList::_tao_any_destructor -+ ACE_reinterpret_cast (void *, _tao_elem), -+ CORBA::PolicyTypeSeq::_tao_any_destructor - ); -- _tao_elem = tmp; - return 1; - } - else - { -- delete tmp; -+ delete _tao_elem; -+ _tao_elem = 0; - } - } - } - ACE_CATCHANY - { -+ delete _tao_elem; -+ _tao_elem = 0; -+ return 0; - } - ACE_ENDTRY; - return 0; - } - --void operator<<= ( -- CORBA::Any &_tao_any, -- const CORBA::PolicyTypeSeq &_tao_elem -- ) // copying --{ -- TAO_OutputCDR stream; -- if (stream << _tao_elem) -- { -- _tao_any._tao_replace ( -- CORBA::_tc_PolicyTypeSeq, -- TAO_ENCAP_BYTE_ORDER, -- stream.begin () -- ); -- } --} -- --void operator<<= (CORBA::Any &_tao_any, CORBA::PolicyTypeSeq *_tao_elem) // non copying --{ -- TAO_OutputCDR stream; -- stream << *_tao_elem; -- _tao_any._tao_replace ( -- CORBA::_tc_PolicyTypeSeq, -- TAO_ENCAP_BYTE_ORDER, -- stream.begin (), -- 1, -- _tao_elem, -- CORBA::PolicyTypeSeq::_tao_any_destructor -- ); --} -- --CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PolicyTypeSeq *&_tao_elem) --{ -- return _tao_any >>= ACE_const_cast( -- const CORBA::PolicyTypeSeq*&, -- _tao_elem -- ); --} -- - CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::PolicyTypeSeq *&_tao_elem) - { -- _tao_elem = 0; - ACE_TRY_NEW_ENV - { - CORBA::TypeCode_var type = _tao_any.type (); - if (!type->equivalent (CORBA::_tc_PolicyTypeSeq, ACE_TRY_ENV)) // not equal - { -+ _tao_elem = 0; - return 0; - } - ACE_TRY_CHECK; - if (_tao_any.any_owns_data ()) - { -- _tao_elem = ACE_static_cast( -- const CORBA::PolicyTypeSeq*, -- _tao_any.value () -- ); -+ _tao_elem = (CORBA::PolicyTypeSeq *)_tao_any.value (); - return 1; - } - else - { -- CORBA::PolicyTypeSeq *tmp; -- ACE_NEW_RETURN (tmp, CORBA::PolicyTypeSeq, 0); -+ ACE_NEW_RETURN (_tao_elem, CORBA::PolicyTypeSeq, 0); - TAO_InputCDR stream ( - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); -- if (stream >> *tmp) -+ if (stream >> *(CORBA::PolicyTypeSeq *)_tao_elem) - { - ((CORBA::Any *)&_tao_any)->_tao_replace ( - CORBA::_tc_PolicyTypeSeq, - 1, -- ACE_static_cast (void *, tmp), -+ ACE_reinterpret_cast (void *, ACE_const_cast (CORBA::PolicyTypeSeq *&, _tao_elem)), - CORBA::PolicyTypeSeq::_tao_any_destructor - ); -- _tao_elem = tmp; - return 1; - } - else - { -- delete tmp; -+ delete ACE_const_cast (CORBA::PolicyTypeSeq *&, _tao_elem); -+ _tao_elem = 0; - } - } - } - ACE_CATCHANY - { -+ delete ACE_const_cast (CORBA::PolicyTypeSeq *&, _tao_elem); -+ _tao_elem = 0; -+ return 0; - } - ACE_ENDTRY; - return 0; -@@ -2186,13 +1226,13 @@ - - void operator<<= (CORBA::Any &_tao_any, CORBA::SetOverrideType _tao_elem) - { -- TAO_OutputCDR stream; -- stream << _tao_elem; -- _tao_any._tao_replace ( -- CORBA::_tc_SetOverrideType, -- TAO_ENCAP_BYTE_ORDER, -- stream.begin () -- ); -+ TAO_OutputCDR stream; -+ stream << _tao_elem; -+ _tao_any._tao_replace ( -+ CORBA::_tc_SetOverrideType, -+ TAO_ENCAP_BYTE_ORDER, -+ stream.begin () -+ ); - } - - CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::SetOverrideType &_tao_elem) -@@ -2222,94 +1262,75 @@ - return 0; - } - --CORBA::PolicyManager_ptr (*_TAO_collocation_CORBA_PolicyManager_Stub_Factory_function_pointer) ( -- CORBA::Object_ptr obj -- ) = 0; --void operator<<= (CORBA::Any &_tao_any, CORBA::PolicyManager_ptr _tao_elem) -+// **************************************************************** -+ -+CORBA::Boolean -+operator<< ( -+ TAO_OutputCDR &strm, -+ const CORBA_Policy_ptr _tao_objref -+ ) - { -- TAO_OutputCDR stream; -- if (stream << _tao_elem) -- { -- _tao_any._tao_replace ( -- CORBA::_tc_PolicyManager, -- TAO_ENCAP_BYTE_ORDER, -- stream.begin (), -- 1, -- CORBA::PolicyManager::_duplicate (_tao_elem), -- CORBA::PolicyManager::_tao_any_destructor -- ); -- } -+ CORBA::Object_ptr _tao_corba_obj = _tao_objref; -+ return (strm << _tao_corba_obj); - } - --CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PolicyManager_ptr &_tao_elem) -+CORBA::Boolean -+operator>> ( -+ TAO_InputCDR &strm, -+ CORBA_Policy_ptr &_tao_objref -+ ) - { - ACE_TRY_NEW_ENV - { -- _tao_elem = CORBA::PolicyManager::_nil (); -- CORBA::TypeCode_var type = _tao_any.type (); -- if (!type->equivalent (CORBA::_tc_PolicyManager, ACE_TRY_ENV)) // not equal -- { -- return 0; -- } -- ACE_TRY_CHECK; -- TAO_InputCDR stream ( -- _tao_any._tao_get_cdr (), -- _tao_any._tao_byte_order () -- ); -- if (stream >> _tao_elem) -- { -- ((CORBA::Any *)&_tao_any)->_tao_replace ( -- CORBA::_tc_PolicyManager, -- 1, -- _tao_elem, -- CORBA::PolicyManager::_tao_any_destructor -+ CORBA::Object_var obj; -+ if ((strm >> obj.inout ()) == 0) -+ return 0; -+ // narrow to the right type -+ _tao_objref = -+ CORBA_Policy::_narrow ( -+ obj.in (), -+ ACE_TRY_ENV - ); -- return 1; -- } -+ ACE_TRY_CHECK; -+ return 1; - } - ACE_CATCHANY - { -- _tao_elem = CORBA::PolicyManager::_nil (); -- return 0; -+ // do nothing - } - ACE_ENDTRY; -- _tao_elem = CORBA::PolicyManager::_nil (); - return 0; - } - --#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ -- defined (ACE_HAS_GNU_REPO) -- template class TAO_Object_Manager; -- #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -- # pragma instantiate TAO_Object_Manager --#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -+void CORBA::PolicyManager::_tao_any_destructor (void *x) -+{ -+ CORBA::PolicyManager *tmp = ACE_static_cast(CORBA::PolicyManager*,x); -+ CORBA::release (tmp); -+} - --CORBA::Current_ptr (*_TAO_collocation_CORBA_Current_Stub_Factory_function_pointer) ( -- CORBA::Object_ptr obj -- ) = 0; --void operator<<= (CORBA::Any &_tao_any, CORBA::Current_ptr _tao_elem) -+void operator<<= (CORBA::Any &_tao_any, CORBA::PolicyManager_ptr _tao_elem) - { -- TAO_OutputCDR stream; -- if (stream << _tao_elem) -- { -- _tao_any._tao_replace ( -- CORBA::_tc_Current, -- TAO_ENCAP_BYTE_ORDER, -- stream.begin (), -- 1, -- CORBA::Current::_duplicate (_tao_elem), -- CORBA::Current::_tao_any_destructor -- ); -- } -+ TAO_OutputCDR stream; -+ if (stream << _tao_elem) -+ { -+ _tao_any._tao_replace ( -+ CORBA::_tc_PolicyManager, -+ TAO_ENCAP_BYTE_ORDER, -+ stream.begin (), -+ 1, -+ _tao_elem, -+ CORBA::PolicyManager::_tao_any_destructor -+ ); -+ } - } - --CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Current_ptr &_tao_elem) -+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PolicyManager_ptr &_tao_elem) - { - ACE_TRY_NEW_ENV - { -- _tao_elem = CORBA::Current::_nil (); -+ _tao_elem = CORBA::PolicyManager::_nil (); - CORBA::TypeCode_var type = _tao_any.type (); -- if (!type->equivalent (CORBA::_tc_Current, ACE_TRY_ENV)) // not equal -+ if (!type->equivalent (CORBA::_tc_PolicyManager, ACE_TRY_ENV)) // not equal - { - return 0; - } -@@ -2318,51 +1339,50 @@ - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); -- if (stream >> _tao_elem) -+ CORBA::Object_var _tao_obj_var; -+ if (stream >> _tao_obj_var.out ()) - { -+ _tao_elem = CORBA::PolicyManager::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); -+ ACE_TRY_CHECK; - ((CORBA::Any *)&_tao_any)->_tao_replace ( -- CORBA::_tc_Current, -+ CORBA::_tc_PolicyManager, - 1, - _tao_elem, -- CORBA::Current::_tao_any_destructor -+ CORBA::PolicyManager::_tao_any_destructor - ); - return 1; - } - } - ACE_CATCHANY - { -- _tao_elem = CORBA::Current::_nil (); -+ _tao_elem = CORBA::PolicyManager::_nil (); - return 0; - } - ACE_ENDTRY; -- _tao_elem = CORBA::Current::_nil (); -+ _tao_elem = CORBA::PolicyManager::_nil (); - return 0; - } - --#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ -- defined (ACE_HAS_GNU_REPO) -- template class TAO_Object_Manager; -- #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -- # pragma instantiate TAO_Object_Manager --#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -+void CORBA::PolicyCurrent::_tao_any_destructor (void *x) -+{ -+ CORBA::PolicyCurrent *tmp = ACE_static_cast(CORBA::PolicyCurrent*,x); -+ CORBA::release (tmp); -+} - --CORBA::PolicyCurrent_ptr (*_TAO_collocation_CORBA_PolicyCurrent_Stub_Factory_function_pointer) ( -- CORBA::Object_ptr obj -- ) = 0; - void operator<<= (CORBA::Any &_tao_any, CORBA::PolicyCurrent_ptr _tao_elem) - { -- TAO_OutputCDR stream; -- if (stream << _tao_elem) -- { -- _tao_any._tao_replace ( -- CORBA::_tc_PolicyCurrent, -- TAO_ENCAP_BYTE_ORDER, -- stream.begin (), -- 1, -- CORBA::PolicyCurrent::_duplicate (_tao_elem), -- CORBA::PolicyCurrent::_tao_any_destructor -- ); -- } -+ TAO_OutputCDR stream; -+ if (stream << _tao_elem) -+ { -+ _tao_any._tao_replace ( -+ CORBA::_tc_PolicyCurrent, -+ TAO_ENCAP_BYTE_ORDER, -+ stream.begin (), -+ 1, -+ _tao_elem, -+ CORBA::PolicyCurrent::_tao_any_destructor -+ ); -+ } - } - - CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PolicyCurrent_ptr &_tao_elem) -@@ -2380,8 +1400,11 @@ - _tao_any._tao_get_cdr (), - _tao_any._tao_byte_order () - ); -- if (stream >> _tao_elem) -+ CORBA::Object_var _tao_obj_var; -+ if (stream >> _tao_obj_var.out ()) - { -+ _tao_elem = CORBA::PolicyCurrent::_narrow (_tao_obj_var.in (), ACE_TRY_ENV); -+ ACE_TRY_CHECK; - ((CORBA::Any *)&_tao_any)->_tao_replace ( - CORBA::_tc_PolicyCurrent, - 1, -@@ -2401,122 +1424,20 @@ - return 0; - } - --#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ -- defined (ACE_HAS_GNU_REPO) -- template class TAO_Object_Manager; -- #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -- # pragma instantiate TAO_Object_Manager --#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -- -- --#if !defined _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_CPP_ --#define _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_CPP_ -- --CORBA::Boolean operator<< ( -- TAO_OutputCDR &strm, -- const CORBA::InvalidPolicies::_tao_seq_UShort &_tao_sequence -- ) --{ -- if (strm << _tao_sequence.length ()) -- { -- // encode all elements -- return strm.write_ushort_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); -- } -- return 0; // error --} -- --CORBA::Boolean operator>> ( -- TAO_InputCDR &strm, -- CORBA::InvalidPolicies::_tao_seq_UShort &_tao_sequence -- ) --{ -- CORBA::ULong _tao_seq_len; -- if (strm >> _tao_seq_len) -- { -- // set the length of the sequence -- _tao_sequence.length (_tao_seq_len); -- // If length is 0 we return true. -- if (0 >= _tao_seq_len) -- return 1; -- // retrieve all the elements -- return strm.read_ushort_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); -- } -- return 0; // error --} -- --#endif /* _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_CPP_ */ -+// **************************************************************** - --CORBA::Boolean operator<< ( -- TAO_OutputCDR &strm, -- const CORBA::PolicyList &_tao_sequence -- ) --{ -- if (strm << _tao_sequence.length ()) -- { -- // encode all elements -- CORBA::Boolean _tao_marshal_flag = 1; -- for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) -- { -- _tao_marshal_flag = (strm << _tao_sequence[i].in ()); -- } -- return _tao_marshal_flag; -- } -- return 0; // error --} -+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - --CORBA::Boolean operator>> ( -- TAO_InputCDR &strm, -- CORBA::PolicyList &_tao_sequence -- ) --{ -- CORBA::ULong _tao_seq_len; -- if (strm >> _tao_seq_len) -- { -- // set the length of the sequence -- _tao_sequence.length (_tao_seq_len); -- // If length is 0 we return true. -- if (0 >= _tao_seq_len) -- return 1; -- // retrieve all the elements -- CORBA::Boolean _tao_marshal_flag = 1; -- for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++) -- { -- _tao_marshal_flag = (strm >> _tao_sequence[i].out ()); -- } -- return _tao_marshal_flag; -- } -- return 0; // error --} -+template class TAO_Unbounded_Sequence; -+template class TAO_Unbounded_Sequence; -+template class TAO_Unbounded_Object_Sequence; -+template class TAO_Object_Manager; - --CORBA::Boolean operator<< ( -- TAO_OutputCDR &strm, -- const CORBA::PolicyTypeSeq &_tao_sequence -- ) --{ -- if (strm << _tao_sequence.length ()) -- { -- // encode all elements -- return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); -- } -- return 0; // error --} -+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - --CORBA::Boolean operator>> ( -- TAO_InputCDR &strm, -- CORBA::PolicyTypeSeq &_tao_sequence -- ) --{ -- CORBA::ULong _tao_seq_len; -- if (strm >> _tao_seq_len) -- { -- // set the length of the sequence -- _tao_sequence.length (_tao_seq_len); -- // If length is 0 we return true. -- if (0 >= _tao_seq_len) -- return 1; -- // retrieve all the elements -- return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ()); -- } -- return 0; // error --} -+#pragma instantiate TAO_Unbounded_Sequence -+#pragma instantiate TAO_Unbounded_Sequence -+#pragma instantiate TAO_Unbounded_Object_Sequence -+#pragma instantiate TAO_Object_Manager - -+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/diffs/PolicyC.h.diff b/TAO/tao/diffs/PolicyC.h.diff index 61b6a63a443..76c3cc2f2fb 100644 --- a/TAO/tao/diffs/PolicyC.h.diff +++ b/TAO/tao/diffs/PolicyC.h.diff @@ -1,1726 +1,199 @@ ---- orig/PolicyC.h Thu Jun 15 14:01:44 2000 -+++ PolicyC.h Fri Jun 9 13:00:52 2000 -@@ -1,1290 +1,638 @@ --/* -*- C++ -*- $Id$ */ -+/* -*- C++ -*- */ -+// $Id$ +--- PolicyC.h Sat Jun 24 01:58:09 2000 ++++ PolicyC.h.mod Sat Jun 24 02:09:13 2000 +@@ -11,7 +11,7 @@ + #define _TAO_IDL_POLICYC_H_ --// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* --// TAO and the TAO IDL Compiler have been developed by the Center for --// Distributed Object Computing at Washington University, St. Louis. -+// ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* -+// TAO ORB and the TAO IDL Compiler have been developed by Washington -+// University Computer Science's Distributed Object Computing Group. - // --// Information about TAO is available at: -+// Information on TAO is available at - // http://www.cs.wustl.edu/~schmidt/TAO.html - --#ifndef _TAO_IDL_ORIG_POLICYC_H_ --#define _TAO_IDL_ORIG_POLICYC_H_ -- -+#ifndef TAO_IDL_POLICYC_H -+#define TAO_IDL_POLICYC_H #include "ace/pre.h" -#include "tao/corba.h" - --#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) --#include "ace/streams.h" --#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ +#include "tao/CurrentC.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) + #if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) + #include "ace/streams.h" +@@ -21,7 +21,12 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ --#include "corbafwd.h" -+#include "tao/CDR.h" -+#include "tao/Environment.h" +-#include "tao/corbafwd.h" ++#include "tao/Encodable.h" +#include "tao/Exception.h" +#include "tao/Sequence.h" ++#include "tao/CDR.h" ++#include "tao/Typecode.h" ++#include "tao/Environment.h" --#if defined (TAO_EXPORT_MACRO) --#undef TAO_EXPORT_MACRO --#endif --#define TAO_EXPORT_MACRO TAO_Export -- --#if defined (TAO_EXPORT_NESTED_CLASSES) --# if defined (TAO_EXPORT_NESTED_MACRO) --# undef TAO_EXPORT_NESTED_MACRO --# endif /* defined (TAO_EXPORT_NESTED_MACRO) */ --# define TAO_EXPORT_NESTED_MACRO TAO_Export --#endif /* TAO_EXPORT_NESTED_CLASSES */ -- --#if defined(_MSC_VER) --#if (_MSC_VER >= 1200) --#pragma warning(push) --#endif /* _MSC_VER >= 1200 */ --#pragma warning(disable:4250) --#endif /* _MSC_VER */ -+#include "tao/Encodable.h" + #if defined (TAO_EXPORT_MACRO) + #undef TAO_EXPORT_MACRO +@@ -42,30 +47,6 @@ + #pragma warning(disable:4250) + #endif /* _MSC_VER */ -TAO_NAMESPACE CORBA -+class TAO_Export CORBA_PolicyError : public CORBA::UserException - { +-{ - typedef CORBA::Short PolicyErrorCode; - typedef CORBA::Short_out PolicyErrorCode_out; - TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyErrorCode; - -- TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short BAD_POLICY; -- -- TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short UNSUPPORTED_POLICY; +- typedef CORBA::ULong PolicyType; +- typedef CORBA::ULong_out PolicyType_out; +- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyType; - -- TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short BAD_POLICY_TYPE; -- -- TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short BAD_POLICY_VALUE; -- -- TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short UNSUPPORTED_POLICY_VALUE; -- -+public: -+ CORBA::PolicyErrorCode reason; - --#if !defined (_CORBA_POLICYERROR_CH_) --#define _CORBA_POLICYERROR_CH_ -+ CORBA_PolicyError (void); // default ctor -+ CORBA_PolicyError (const CORBA::PolicyError &); // copy ctor -+ ~CORBA_PolicyError (void); // dtor -+ CORBA_PolicyError &operator= (const CORBA_PolicyError &); - -- class TAO_Export PolicyError : public CORBA::UserException +- enum SetOverrideType - { -- public: -+ virtual void _raise (void); - -- ACE_NESTED_CLASS (CORBA, PolicyErrorCode) reason; -+ virtual void _tao_encode (TAO_OutputCDR &cdr, -+ CORBA::Environment &) const; -+ virtual void _tao_decode (TAO_InputCDR &cdr, -+ CORBA::Environment &); - -- PolicyError (void); // default ctor -- PolicyError (const PolicyError &); // copy ctor -- ~PolicyError (void); -+ static CORBA_PolicyError *_downcast (CORBA::Exception *); - static void _tao_any_destructor (void*); -- PolicyError &operator= (const PolicyError &); -- - -- virtual void _raise (void); -- -- virtual void _tao_encode ( -- TAO_OutputCDR &, -- CORBA::Environment &) const; -- virtual void _tao_decode ( -- TAO_InputCDR &, -- CORBA::Environment &); -- -- static PolicyError *_downcast (CORBA::Exception *); -- -- PolicyError ( -- ACE_NESTED_CLASS (CORBA, PolicyErrorCode) _tao_reason -- ); -+ CORBA_PolicyError( -+ CORBA::PolicyErrorCode _tao_reason); - - // = TAO extension - static CORBA::Exception *_alloc (void); -- - }; // exception CORBA::PolicyError - --TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyError; -+// **************************************************************** - -+class CORBA_InvalidPolicies; -+typedef CORBA_InvalidPolicies *CORBA_InvalidPolicies_ptr; - --#endif /* end #if !defined */ -- -- --#if !defined (_CORBA_INVALIDPOLICIES_CH_) --#define _CORBA_INVALIDPOLICIES_CH_ -- --class TAO_Export InvalidPolicies : public CORBA::UserException -+class TAO_Export CORBA_InvalidPolicies : public CORBA::UserException - { - public: -- -- --#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -- --#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_) --#define __TAO_UNBOUNDED_SEQUENCE_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_ -- -- class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort : public TAO_Unbounded_Base_Sequence -+ class TAO_Export _tao_seq_UShort : public TAO_Unbounded_Sequence - { - public: -- // = Initialization and termination methods. -- -- _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void); // Default constructor. -- _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum); -- _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (CORBA::ULong maximum, -- CORBA::ULong length, -- CORBA::UShort *data, -- CORBA::Boolean release = 0); -- _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs); -- _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &operator= (const _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort &rhs); -- virtual ~_TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort (void); // Dtor. -- // = Accessors. -- CORBA::UShort &operator[] (CORBA::ULong i); -- const CORBA::UShort &operator[] (CORBA::ULong i) const; -- // = Static operations. -- static CORBA::UShort *allocbuf (CORBA::ULong size); -- static void freebuf (CORBA::UShort *buffer); -- virtual void _allocate_buffer (CORBA::ULong length); -- virtual void _deallocate_buffer (void); -- // Implement the TAO_Base_Sequence methods (see Sequence.h) -- -- CORBA::UShort *get_buffer (CORBA::Boolean orphan = 0); -- const CORBA::UShort *get_buffer (void) const; -- void replace (CORBA::ULong max, -- CORBA::ULong length, -- CORBA::UShort *data, -- CORBA::Boolean release); -+ _tao_seq_UShort (void); // default ctor -+ _tao_seq_UShort (CORBA::ULong max); // uses max size -+ _tao_seq_UShort ( -+ CORBA::ULong max, -+ CORBA::ULong length, -+ CORBA::UShort *buffer, -+ CORBA::Boolean release=0 -+ ); -+ _tao_seq_UShort (const _tao_seq_UShort &); // copy ctor -+ ~_tao_seq_UShort (void); // dtor - }; -+ typedef _tao_seq_UShort *_tao_seq_UShort_ptr; -+ static CORBA::TypeCode_ptr _tc__tao_seq_UShort; - --#endif /* end #if !defined */ -- -- --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -- --#if !defined (_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_) --#define _CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT_CH_ -- --class _tao_seq_UShort; --class _tao_seq_UShort_var; -- --// ************************************************************* --// _tao_seq_UShort --// ************************************************************* -- --class TAO_Export _tao_seq_UShort : public --#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -- _TAO_Unbounded_Sequence_CORBA_InvalidPolicies__tao_seq_UShort --#else /* TAO_USE_SEQUENCE_TEMPLATES */ -- TAO_Unbounded_Sequence --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ --{ --public: -- _tao_seq_UShort (void); // default ctor -- _tao_seq_UShort (CORBA::ULong max); // uses max size -- _tao_seq_UShort ( -- CORBA::ULong max, -- CORBA::ULong length, -- CORBA::UShort *buffer, -- CORBA::Boolean release=0 -- ); -- _tao_seq_UShort (const _tao_seq_UShort &); // copy ctor -- ~_tao_seq_UShort (void); -- static void _tao_any_destructor (void*); -- --#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) -- typedef _tao_seq_UShort_var _var_type; --#endif /* ! __GNUC__ || g++ >= 2.8 */ -- --}; -- --#endif /* end #if !defined */ -- -+ _tao_seq_UShort indices; - --#if !defined (_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT___VAR_CH_) --#define _CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT___VAR_CH_ -+ CORBA_InvalidPolicies (void); // default ctor -+ CORBA_InvalidPolicies (const CORBA_InvalidPolicies &); // copy ctor -+ ~CORBA_InvalidPolicies (void); // dtor -+ CORBA_InvalidPolicies &operator= (const CORBA_InvalidPolicies &); - --// ************************************************************* --// class CORBA::InvalidPolicies::_tao_seq_UShort_var --// ************************************************************* -- --class TAO_Export _tao_seq_UShort_var --{ --public: -- _tao_seq_UShort_var (void); // default constructor -- _tao_seq_UShort_var (_tao_seq_UShort *); -- _tao_seq_UShort_var (const _tao_seq_UShort_var &); // copy constructor -- _tao_seq_UShort_var (const _tao_seq_UShort &); // fixed-size base types only -- ~_tao_seq_UShort_var (void); // destructor -- -- _tao_seq_UShort_var &operator= (_tao_seq_UShort *); -- _tao_seq_UShort_var &operator= (const _tao_seq_UShort_var &); -- _tao_seq_UShort_var &operator= (const _tao_seq_UShort &); // fixed-size base types only -- _tao_seq_UShort *operator-> (void); -- const _tao_seq_UShort *operator-> (void) const; -- -- operator const _tao_seq_UShort &() const; -- operator _tao_seq_UShort &(); -- operator _tao_seq_UShort &() const; -- -- CORBA::UShort &operator[] (CORBA::ULong index); -- // in, inout, out, _retn -- const _tao_seq_UShort &in (void) const; -- _tao_seq_UShort &inout (void); -- _tao_seq_UShort *&out (void); -- _tao_seq_UShort *_retn (void); -- _tao_seq_UShort *ptr (void) const; -- --private: -- _tao_seq_UShort *ptr_; --}; -- -- --#endif /* end #if !defined */ -- -- --#if !defined (_CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT___OUT_CH_) --#define _CORBA_INVALIDPOLICIES__TAO_SEQ_USHORT___OUT_CH_ -- --class TAO_Export _tao_seq_UShort_out --{ --public: -- _tao_seq_UShort_out (_tao_seq_UShort *&); -- _tao_seq_UShort_out (_tao_seq_UShort_var &); -- _tao_seq_UShort_out (const _tao_seq_UShort_out &); -- _tao_seq_UShort_out &operator= (const _tao_seq_UShort_out &); -- _tao_seq_UShort_out &operator= (_tao_seq_UShort *); -- operator _tao_seq_UShort *&(); -- _tao_seq_UShort *&ptr (void); -- _tao_seq_UShort *operator-> (void); -- CORBA::UShort &operator[] (CORBA::ULong index); -- --private: -- _tao_seq_UShort *&ptr_; -- // assignment from T_var not allowed -- void operator= (const _tao_seq_UShort_var &); --}; -- -- --#endif /* end #if !defined */ -- --#if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) -- typedef _tao_seq_UShort _indices_seq; --#endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */ -+ virtual void _raise (void); - -- _tao_seq_UShort indices; -+ virtual void _tao_encode (TAO_OutputCDR &cdr, -+ CORBA::Environment &) const; -+ virtual void _tao_decode (TAO_InputCDR &cdr, -+ CORBA::Environment &); - -- InvalidPolicies (void); // default ctor -- InvalidPolicies (const InvalidPolicies &); // copy ctor -- ~InvalidPolicies (void); -+ static CORBA_InvalidPolicies *_downcast (CORBA::Exception *); - static void _tao_any_destructor (void*); -- InvalidPolicies &operator= (const InvalidPolicies &); -- -- -- virtual void _raise (void); - -- virtual void _tao_encode ( -- TAO_OutputCDR &, -- CORBA::Environment &) const; -- virtual void _tao_decode ( -- TAO_InputCDR &, -- CORBA::Environment &); -- -- static InvalidPolicies *_downcast (CORBA::Exception *); -- -- InvalidPolicies ( -- const _tao_seq_UShort & _tao_indices -- ); -+ CORBA_InvalidPolicies( -+ const _tao_seq_UShort & _tao_indices); - - // = TAO extension - static CORBA::Exception *_alloc (void); -- - }; // exception CORBA::InvalidPolicies - --TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InvalidPolicies; -- -- --#endif /* end #if !defined */ -- --typedef CORBA::ULong PolicyType; --typedef CORBA::ULong_out PolicyType_out; --TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyType; -- -+// **************************************************************** - --#if !defined (_CORBA_POLICY___PTR_CH_) --#define _CORBA_POLICY___PTR_CH_ -+class CORBA_Policy; -+typedef CORBA_Policy *CORBA_Policy_ptr; - --class Policy; --typedef Policy *Policy_ptr; -- --#endif /* end #if !defined */ -- -- --#if !defined (_CORBA_POLICY___VAR_CH_) --#define _CORBA_POLICY___VAR_CH_ -- --class TAO_Export Policy_var : public TAO_Base_var -+class TAO_Export CORBA_Policy_var : public TAO_Base_var - { - public: -- Policy_var (void); // default constructor -- Policy_var (Policy_ptr); -- Policy_var (const Policy_var &); // copy constructor -- ~Policy_var (void); // destructor -- -- Policy_var &operator= (Policy_ptr); -- Policy_var &operator= (const Policy_var &); -- Policy_ptr operator-> (void) const; -- -- operator const Policy_ptr &() const; -- operator Policy_ptr &(); -- // in, inout, out, _retn -- Policy_ptr in (void) const; -- Policy_ptr &inout (void); -- Policy_ptr &out (void); -- Policy_ptr _retn (void); -- Policy_ptr ptr (void) const; -+ CORBA_Policy_var (void); // default constructor -+ CORBA_Policy_var (CORBA_Policy_ptr p) : ptr_ (p) {} -+ CORBA_Policy_var (const CORBA_Policy_var &); // copy constructor -+ ~CORBA_Policy_var (void); // destructor -+ -+ CORBA_Policy_var &operator= (CORBA_Policy_ptr); -+ CORBA_Policy_var &operator= (const CORBA_Policy_var &); -+ CORBA_Policy_ptr operator-> (void) const; -+ -+ operator const CORBA_Policy_ptr &() const; -+ operator CORBA_Policy_ptr &(); -+ // in, inout, out, _retn -+ CORBA_Policy_ptr in (void) const; -+ CORBA_Policy_ptr &inout (void); -+ CORBA_Policy_ptr &out (void); -+ CORBA_Policy_ptr _retn (void); -+ CORBA_Policy_ptr ptr (void) const; - - private: -- Policy_ptr ptr_; -+ CORBA_Policy_ptr ptr_; - // Unimplemented - prevents widening assignment. -- Policy_var (const TAO_Base_var &rhs); -- Policy_var &operator= (const TAO_Base_var &rhs); -+ CORBA_Policy_var (const TAO_Base_var &rhs); -+ CORBA_Policy_var &operator= (const TAO_Base_var &rhs); - }; - -- --#endif /* end #if !defined */ -- -- --#if !defined (_CORBA_POLICY___OUT_CH_) --#define _CORBA_POLICY___OUT_CH_ -- --class TAO_Export Policy_out -+class TAO_Export CORBA_Policy_out - { - public: -- Policy_out (Policy_ptr &); -- Policy_out (Policy_var &); -- Policy_out (const Policy_out &); -- Policy_out &operator= (const Policy_out &); -- Policy_out &operator= (const Policy_var &); -- Policy_out &operator= (Policy_ptr); -- operator Policy_ptr &(); -- Policy_ptr &ptr (void); -- Policy_ptr operator-> (void); -- -+ CORBA_Policy_out (CORBA_Policy_ptr &); -+ CORBA_Policy_out (CORBA_Policy_var &); -+ CORBA_Policy_out (CORBA_Policy_out &); -+ CORBA_Policy_out &operator= (CORBA_Policy_out &); -+ CORBA_Policy_out &operator= (const CORBA_Policy_var &); -+ CORBA_Policy_out &operator= (CORBA_Policy_ptr); -+ operator CORBA_Policy_ptr &(); -+ CORBA_Policy_ptr &ptr (void); -+ CORBA_Policy_ptr operator-> (void); -+ - private: -- Policy_ptr &ptr_; -+ CORBA_Policy_ptr &ptr_; - }; - -- --#endif /* end #if !defined */ -- -- --#if !defined (_CORBA_POLICY_CH_) --#define _CORBA_POLICY_CH_ +- SET_OVERRIDE, +- ADD_OVERRIDE, +- SetOverrideType_TAO_ENUM_32BIT_ENFORCER = 0x7FFFFFFF +- }; +- typedef SetOverrideType &SetOverrideType_out; +- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SetOverrideType; - --class TAO_Export Policy : public virtual CORBA_Object -+class TAO_Export CORBA_Policy : public virtual CORBA_Object, -+ public TAO_Encodable - { - public: --#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) -- typedef Policy_ptr _ptr_type; -- typedef Policy_var _var_type; --#endif /* ! __GNUC__ || g++ >= 2.8 */ -+#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 -+ typedef CORBA_Policy_ptr _ptr_type; -+ typedef CORBA_Policy_var _var_type; -+#endif /* __GNUC__ */ - - // the static operations -- static Policy_ptr _duplicate (Policy_ptr obj); -- static Policy_ptr _narrow ( -+ static CORBA_Policy_ptr _duplicate (CORBA_Policy_ptr obj); -+ static CORBA_Policy_ptr _narrow ( - CORBA::Object_ptr obj, -- CORBA::Environment &ACE_TRY_ENV = -+ CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment () - ); -- static Policy_ptr _unchecked_narrow ( -- CORBA::Object_ptr obj, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -- ); -- static Policy_ptr _nil (void) -- { -- return (Policy_ptr)0; -- } - -+ static CORBA_Policy_ptr _nil (void); - static void _tao_any_destructor (void*); - -+#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES) - virtual CORBA::PolicyType policy_type ( -- CORBA::Environment &ACE_TRY_ENV = -+ CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment () -- ) -- ACE_THROW_SPEC (( -- CORBA::SystemException -- )); +-} +-TAO_NAMESPACE_CLOSE // module CORBA - -- virtual CORBA::Policy_ptr copy ( -- CORBA::Environment &ACE_TRY_ENV = -+ ); -+ virtual CORBA_Policy_ptr copy ( -+ CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment () -- ) -- ACE_THROW_SPEC (( -- CORBA::SystemException -- )); - -+ ); -+ virtual void destroy ( -+ CORBA_Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ); -+#else -+ virtual CORBA::PolicyType policy_type ( -+ CORBA_Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) = 0; -+ virtual CORBA_Policy_ptr copy ( -+ CORBA_Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ) = 0; - virtual void destroy ( -- CORBA::Environment &ACE_TRY_ENV = -+ CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment () -- ) -- ACE_THROW_SPEC (( -- CORBA::SystemException -- )); -+ ) = 0; -+#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */ + #if !defined (_CORBA_POLICYERROR_CH_) + #define _CORBA_POLICYERROR_CH_ - 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); -- +@@ -434,6 +415,14 @@ + virtual const char* _interface_repository_id (void) const; -+ // The following methods are used for embedding client-exposed -+ // policies into an IOR. These methods are not part of the idl -+ // compiler generated code: they were added by hand. -+ + virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr); -+ // Encode the Policy into a CDR representation. Returns true ++ // Encode the Policy into a CDR representation. Returns true + // on success and false on failure. + + virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr); -+ // Decode the Policy from a CDR representation. Returns true ++ // Decode the Policy from a CDR representation. Returns true + // on success and false on failure. + protected: -- Policy (void); -- Policy (TAO_Stub *objref, -- TAO_ServantBase *_tao_servant = 0, -- CORBA::Boolean _tao_collocated = 0 -- ); -- virtual ~Policy (void); -+ CORBA_Policy (void); // default constructor -+ CORBA_Policy (TAO_Stub *objref, -+ TAO_ServantBase *_tao_servant = 0, -+ CORBA::Boolean _tao_collocated = 0 -+ ); -+ virtual ~CORBA_Policy (void); - private: -- Policy (const Policy &); -- void operator= (const Policy &); -+ CORBA_Policy (const CORBA_Policy &); -+ void operator= (const CORBA_Policy &); - }; + CORBA_Policy (void); + CORBA_Policy (TAO_Stub *objref, +@@ -886,118 +875,6 @@ + #endif /* end #if !defined */ + +-#if !defined (_CORBA_CURRENT___PTR_CH_) +-#define _CORBA_CURRENT___PTR_CH_ - --#endif /* end #if !defined */ -- --TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Policy; -- -- --#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -- --#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CH_) --#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_POLICYLIST_CH_ -- -- class _TAO_Unbounded_Object_Sequence_CORBA_PolicyList : public TAO_Unbounded_Base_Sequence -- { -- public: -- // = Initialization and termination methods. -- -- _TAO_Unbounded_Object_Sequence_CORBA_PolicyList (void); -- _TAO_Unbounded_Object_Sequence_CORBA_PolicyList (CORBA::ULong maximum); -- _TAO_Unbounded_Object_Sequence_CORBA_PolicyList (CORBA::ULong maximum, -- CORBA::ULong length, -- Policy* *value, -- CORBA::Boolean release = 0); -- _TAO_Unbounded_Object_Sequence_CORBA_PolicyList(const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs); -- virtual ~_TAO_Unbounded_Object_Sequence_CORBA_PolicyList (void); -- _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_PolicyList &rhs); -- TAO_Object_Manager operator[] (CORBA::ULong index) const; -- static Policy **allocbuf (CORBA::ULong nelems); -- static void freebuf (Policy **buffer); -- // The Base_Sequence functions, please see tao/Sequence.h -- virtual void _allocate_buffer (CORBA::ULong length); -- virtual void _deallocate_buffer (void); -- Policy* *get_buffer (CORBA::Boolean orphan = 0); -- const Policy* *get_buffer (void) const; -- virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol); -- virtual void _downcast ( -- void* target, -- CORBA_Object *src, -- CORBA_Environment &ACE_TRY_ENV = -- TAO_default_environment () -- ); -- virtual CORBA_Object* _upcast (void *src) const; -- -- }; -- --#endif /* end #if !defined */ -- -- --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -- --#if !defined (_CORBA_POLICYLIST_CH_) --#define _CORBA_POLICYLIST_CH_ -- --class PolicyList; --class PolicyList_var; +-class CORBA_Current; +-typedef CORBA_Current *CORBA_Current_ptr; - - // ************************************************************* --// PolicyList -+// CORBA_PolicyList - // ************************************************************* - --class TAO_Export PolicyList : public --#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -- _TAO_Unbounded_Object_Sequence_CORBA_PolicyList --#else /* TAO_USE_SEQUENCE_TEMPLATES */ -- TAO_Unbounded_Object_Sequence --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -+class TAO_Export CORBA_PolicyList : public TAO_Unbounded_Object_Sequence - { - public: -- PolicyList (void); // default ctor -- PolicyList (CORBA::ULong max); // uses max size -- PolicyList ( -- CORBA::ULong max, -- CORBA::ULong length, -- Policy_ptr *buffer, -- CORBA::Boolean release=0 -- ); -- PolicyList (const PolicyList &); // copy ctor -- ~PolicyList (void); -- static void _tao_any_destructor (void*); -+#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 -+ typedef CORBA_PolicyList_var _var_type; -+#endif /* __GNUC__ */ - --#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) -- typedef PolicyList_var _var_type; --#endif /* ! __GNUC__ || g++ >= 2.8 */ -+ CORBA_PolicyList (void); // default ctor -+ CORBA_PolicyList (CORBA::ULong max); // uses max size -+ CORBA_PolicyList ( -+ CORBA::ULong max, -+ CORBA::ULong length, -+ CORBA_Policy_ptr *buffer, -+ CORBA::Boolean release=0 -+ ); -+ CORBA_PolicyList (const CORBA_PolicyList &); // copy ctor -+ ~CORBA_PolicyList (void); // dtor - -+ static void _tao_any_destructor (void*); - }; - -#endif /* end #if !defined */ - - --#if !defined (_CORBA_POLICYLIST___VAR_CH_) --#define _CORBA_POLICYLIST___VAR_CH_ +-#if !defined (_CORBA_CURRENT___VAR_CH_) +-#define _CORBA_CURRENT___VAR_CH_ - - // ************************************************************* - // class CORBA::PolicyList_var - // ************************************************************* - --class TAO_Export PolicyList_var -+class TAO_Export CORBA_PolicyList_var - { - public: -- PolicyList_var (void); // default constructor -- PolicyList_var (PolicyList *); -- PolicyList_var (const PolicyList_var &); // copy constructor -- ~PolicyList_var (void); // destructor -- -- PolicyList_var &operator= (PolicyList *); -- PolicyList_var &operator= (const PolicyList_var &); -- PolicyList *operator-> (void); -- const PolicyList *operator-> (void) const; +-class TAO_Export CORBA_Current_var : public TAO_Base_var +-{ +-public: +- CORBA_Current_var (void); // default constructor +- CORBA_Current_var (CORBA_Current_ptr p) : ptr_ (p) {} +- CORBA_Current_var (const CORBA_Current_var &); // copy constructor +- ~CORBA_Current_var (void); // destructor - -- operator const PolicyList &() const; -- operator PolicyList &(); -- operator PolicyList &() const; -- operator PolicyList *&(); // variable-size base types only +- CORBA_Current_var &operator= (CORBA_Current_ptr); +- CORBA_Current_var &operator= (const CORBA_Current_var &); +- CORBA_Current_ptr operator-> (void) const; - -- TAO_Object_Manager operator[] (CORBA::ULong index); +- operator const CORBA_Current_ptr &() const; +- operator CORBA_Current_ptr &(); - // in, inout, out, _retn -- const PolicyList &in (void) const; -- PolicyList &inout (void); -- PolicyList *&out (void); -- PolicyList *_retn (void); -- PolicyList *ptr (void) const; +- CORBA_Current_ptr in (void) const; +- CORBA_Current_ptr &inout (void); +- CORBA_Current_ptr &out (void); +- CORBA_Current_ptr _retn (void); +- CORBA_Current_ptr ptr (void) const; - -private: -- PolicyList *ptr_; +- CORBA_Current_ptr ptr_; +- // Unimplemented - prevents widening assignment. +- CORBA_Current_var (const TAO_Base_var &rhs); +- CORBA_Current_var &operator= (const TAO_Base_var &rhs); -}; -+ CORBA_PolicyList_var (void); // default constructor -+ CORBA_PolicyList_var (CORBA_PolicyList *); -+ CORBA_PolicyList_var (const CORBA_PolicyList_var &); // copy constructor -+ ~CORBA_PolicyList_var (void); // destructor - -+ CORBA_PolicyList_var &operator= (CORBA_PolicyList *); -+ CORBA_PolicyList_var &operator= (const CORBA_PolicyList_var &); -+ CORBA_PolicyList *operator-> (void); -+ const CORBA_PolicyList *operator-> (void) const; - --#endif /* end #if !defined */ -+ operator const CORBA_PolicyList &() const; -+ operator CORBA_PolicyList &(); -+ operator CORBA_PolicyList &() const; -+ TAO_Object_Manager operator[] (CORBA::ULong index); -+ // in, inout, out, _retn -+ const CORBA_PolicyList &in (void) const; -+ CORBA_PolicyList &inout (void); -+ CORBA_PolicyList *&out (void); -+ CORBA_PolicyList *_retn (void); -+ CORBA_PolicyList *ptr (void) const; - -+private: -+ CORBA_PolicyList *ptr_; -+}; - --#if !defined (_CORBA_POLICYLIST___OUT_CH_) --#define _CORBA_POLICYLIST___OUT_CH_ - --class TAO_Export PolicyList_out -+class TAO_Export CORBA_PolicyList_out - { - public: -- PolicyList_out (PolicyList *&); -- PolicyList_out (PolicyList_var &); -- PolicyList_out (const PolicyList_out &); -- PolicyList_out &operator= (const PolicyList_out &); -- PolicyList_out &operator= (PolicyList *); -- operator PolicyList *&(); -- PolicyList *&ptr (void); -- PolicyList *operator-> (void); -- TAO_Object_Manager operator[] (CORBA::ULong index); -- -+ CORBA_PolicyList_out (CORBA_PolicyList *&); -+ CORBA_PolicyList_out (CORBA_PolicyList_var &); -+ CORBA_PolicyList_out (const CORBA_PolicyList_out &); -+ CORBA_PolicyList_out &operator= (CORBA_PolicyList_out &); -+ CORBA_PolicyList_out &operator= (CORBA_PolicyList *); -+ operator CORBA_PolicyList *&(); -+ CORBA_PolicyList *&ptr (void); -+ CORBA_PolicyList *operator-> (void); -+ TAO_Object_Manager operator[] (CORBA::ULong index); -+ - private: -- PolicyList *&ptr_; -+ CORBA_PolicyList *&ptr_; - // assignment from T_var not allowed -- void operator= (const PolicyList_var &); -+ void operator= (const CORBA_PolicyList_var &); - }; - - -#endif /* end #if !defined */ - --TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyList; -- -- --#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -- --#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CH_) --#define __TAO_UNBOUNDED_SEQUENCE_CORBA_POLICYTYPESEQ_CH_ -- -- class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq : public TAO_Unbounded_Base_Sequence -- { -- public: -- // = Initialization and termination methods. -- -- _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void); // Default constructor. -- _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum); -- _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (CORBA::ULong maximum, -- CORBA::ULong length, -- CORBA::ULong *data, -- CORBA::Boolean release = 0); -- _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs); -- _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &operator= (const _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq &rhs); -- virtual ~_TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq (void); // Dtor. -- // = Accessors. -- CORBA::ULong &operator[] (CORBA::ULong i); -- const CORBA::ULong &operator[] (CORBA::ULong i) const; -- // = Static operations. -- static CORBA::ULong *allocbuf (CORBA::ULong size); -- static void freebuf (CORBA::ULong *buffer); -- virtual void _allocate_buffer (CORBA::ULong length); -- virtual void _deallocate_buffer (void); -- // Implement the TAO_Base_Sequence methods (see Sequence.h) -- -- CORBA::ULong *get_buffer (CORBA::Boolean orphan = 0); -- const CORBA::ULong *get_buffer (void) const; -- void replace (CORBA::ULong max, -- CORBA::ULong length, -- CORBA::ULong *data, -- CORBA::Boolean release); -- }; -- --#endif /* end #if !defined */ -- -- --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -- --#if !defined (_CORBA_POLICYTYPESEQ_CH_) --#define _CORBA_POLICYTYPESEQ_CH_ -- --class PolicyTypeSeq; --class PolicyTypeSeq_var; -- - // ************************************************************* - // PolicyTypeSeq - // ************************************************************* - --class TAO_Export PolicyTypeSeq : public --#if !defined (TAO_USE_SEQUENCE_TEMPLATES) -- _TAO_Unbounded_Sequence_CORBA_PolicyTypeSeq --#else /* TAO_USE_SEQUENCE_TEMPLATES */ -- TAO_Unbounded_Sequence --#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ -+class TAO_Export CORBA_PolicyTypeSeq : public TAO_Unbounded_Sequence - { - public: -- PolicyTypeSeq (void); // default ctor -- PolicyTypeSeq (CORBA::ULong max); // uses max size -- PolicyTypeSeq ( -- CORBA::ULong max, -- CORBA::ULong length, -- CORBA::ULong *buffer, -- CORBA::Boolean release=0 -- ); -- PolicyTypeSeq (const PolicyTypeSeq &); // copy ctor -- ~PolicyTypeSeq (void); -- static void _tao_any_destructor (void*); -- --#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) -- typedef PolicyTypeSeq_var _var_type; --#endif /* ! __GNUC__ || g++ >= 2.8 */ -+ CORBA_PolicyTypeSeq (void); // default ctor -+ CORBA_PolicyTypeSeq (CORBA::ULong max); // uses max size -+ CORBA_PolicyTypeSeq ( -+ CORBA::ULong max, -+ CORBA::ULong length, -+ CORBA::ULong *buffer, -+ CORBA::Boolean release=0 -+ ); -+ CORBA_PolicyTypeSeq (const CORBA_PolicyTypeSeq &); // copy ctor -+ ~CORBA_PolicyTypeSeq (void); // dtor - -+ static void _tao_any_destructor (void*); - }; -- --#endif /* end #if !defined */ -- -- --#if !defined (_CORBA_POLICYTYPESEQ___VAR_CH_) --#define _CORBA_POLICYTYPESEQ___VAR_CH_ -+typedef CORBA_PolicyTypeSeq *CORBA_PolicyTypeSeq_ptr; - - // ************************************************************* - // class CORBA::PolicyTypeSeq_var - // ************************************************************* - --class TAO_Export PolicyTypeSeq_var -+class TAO_Export CORBA_PolicyTypeSeq_var - { - public: -- PolicyTypeSeq_var (void); // default constructor -- PolicyTypeSeq_var (PolicyTypeSeq *); -- PolicyTypeSeq_var (const PolicyTypeSeq_var &); // copy constructor -- PolicyTypeSeq_var (const PolicyTypeSeq &); // fixed-size base types only -- ~PolicyTypeSeq_var (void); // destructor -- -- PolicyTypeSeq_var &operator= (PolicyTypeSeq *); -- PolicyTypeSeq_var &operator= (const PolicyTypeSeq_var &); -- PolicyTypeSeq_var &operator= (const PolicyTypeSeq &); // fixed-size base types only -- PolicyTypeSeq *operator-> (void); -- const PolicyTypeSeq *operator-> (void) const; -- -- operator const PolicyTypeSeq &() const; -- operator PolicyTypeSeq &(); -- operator PolicyTypeSeq &() const; -- -- PolicyType &operator[] (CORBA::ULong index); -- // in, inout, out, _retn -- const PolicyTypeSeq &in (void) const; -- PolicyTypeSeq &inout (void); -- PolicyTypeSeq *&out (void); -- PolicyTypeSeq *_retn (void); -- PolicyTypeSeq *ptr (void) const; -- --private: -- PolicyTypeSeq *ptr_; --}; - -+ CORBA_PolicyTypeSeq_var (void); // default constructor -+ CORBA_PolicyTypeSeq_var (CORBA_PolicyTypeSeq *); -+ CORBA_PolicyTypeSeq_var (const CORBA_PolicyTypeSeq_var &); -+ ~CORBA_PolicyTypeSeq_var (void); // destructor - --#endif /* end #if !defined */ -+ CORBA_PolicyTypeSeq_var &operator= (CORBA_PolicyTypeSeq *); -+ CORBA_PolicyTypeSeq_var &operator= (const CORBA_PolicyTypeSeq_var &); -+ CORBA_PolicyTypeSeq *operator-> (void); -+ const CORBA_PolicyTypeSeq *operator-> (void) const; - -+ operator const CORBA_PolicyTypeSeq &() const; -+ operator CORBA_PolicyTypeSeq &(); -+ operator CORBA_PolicyTypeSeq &() const; -+ CORBA::PolicyType &operator[] (CORBA::ULong slot); -+ // in, inout, out, _retn -+ const CORBA_PolicyTypeSeq &in (void) const; -+ CORBA_PolicyTypeSeq &inout (void); -+ CORBA_PolicyTypeSeq *&out (void); -+ CORBA_PolicyTypeSeq *_retn (void); -+ CORBA_PolicyTypeSeq *ptr (void) const; - --#if !defined (_CORBA_POLICYTYPESEQ___OUT_CH_) --#define _CORBA_POLICYTYPESEQ___OUT_CH_ +-#if !defined (_CORBA_CURRENT___OUT_CH_) +-#define _CORBA_CURRENT___OUT_CH_ - --class TAO_Export PolicyTypeSeq_out +-class TAO_Export CORBA_Current_out -{ -public: -- PolicyTypeSeq_out (PolicyTypeSeq *&); -- PolicyTypeSeq_out (PolicyTypeSeq_var &); -- PolicyTypeSeq_out (const PolicyTypeSeq_out &); -- PolicyTypeSeq_out &operator= (const PolicyTypeSeq_out &); -- PolicyTypeSeq_out &operator= (PolicyTypeSeq *); -- operator PolicyTypeSeq *&(); -- PolicyTypeSeq *&ptr (void); -- PolicyTypeSeq *operator-> (void); -- PolicyType &operator[] (CORBA::ULong index); +- CORBA_Current_out (CORBA_Current_ptr &); +- CORBA_Current_out (CORBA_Current_var &); +- CORBA_Current_out (const CORBA_Current_out &); +- CORBA_Current_out &operator= (const CORBA_Current_out &); +- CORBA_Current_out &operator= (const CORBA_Current_var &); +- CORBA_Current_out &operator= (CORBA_Current_ptr); +- operator CORBA_Current_ptr &(); +- CORBA_Current_ptr &ptr (void); +- CORBA_Current_ptr operator-> (void); - - private: -- PolicyTypeSeq *&ptr_; -- // assignment from T_var not allowed -- void operator= (const PolicyTypeSeq_var &); +-private: +- CORBA_Current_ptr &ptr_; -}; - - -#endif /* end #if !defined */ - --TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyTypeSeq; -- --enum SetOverrideType --{ -- SET_OVERRIDE, -- ADD_OVERRIDE, -- SetOverrideType_TAO_ENUM_32BIT_ENFORCER = 0x7FFFFFFF -+ CORBA_PolicyTypeSeq *ptr_; - }; --typedef SetOverrideType &SetOverrideType_out; --TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SetOverrideType; -- -- --#if !defined (_CORBA_POLICYMANAGER___PTR_CH_) --#define _CORBA_POLICYMANAGER___PTR_CH_ - --class PolicyManager; --typedef PolicyManager *PolicyManager_ptr; -- --#endif /* end #if !defined */ -- -- --#if !defined (_CORBA_POLICYMANAGER___VAR_CH_) --#define _CORBA_POLICYMANAGER___VAR_CH_ -- --class TAO_Export PolicyManager_var : public TAO_Base_var -+class TAO_Export CORBA_PolicyTypeSeq_out - { - public: -- PolicyManager_var (void); // default constructor -- PolicyManager_var (PolicyManager_ptr); -- PolicyManager_var (const PolicyManager_var &); // copy constructor -- ~PolicyManager_var (void); // destructor -- -- PolicyManager_var &operator= (PolicyManager_ptr); -- PolicyManager_var &operator= (const PolicyManager_var &); -- PolicyManager_ptr operator-> (void) const; -- -- operator const PolicyManager_ptr &() const; -- operator PolicyManager_ptr &(); -- // in, inout, out, _retn -- PolicyManager_ptr in (void) const; -- PolicyManager_ptr &inout (void); -- PolicyManager_ptr &out (void); -- PolicyManager_ptr _retn (void); -- PolicyManager_ptr ptr (void) const; -+ CORBA_PolicyTypeSeq_out (CORBA_PolicyTypeSeq *&); -+ CORBA_PolicyTypeSeq_out (CORBA_PolicyTypeSeq_var &); -+ CORBA_PolicyTypeSeq_out (const CORBA_PolicyTypeSeq_out &); -+ CORBA_PolicyTypeSeq_out &operator= (const CORBA_PolicyTypeSeq_out &); -+ CORBA_PolicyTypeSeq_out &operator= (CORBA_PolicyTypeSeq *); -+ operator CORBA_PolicyTypeSeq *&(); -+ CORBA_PolicyTypeSeq *&ptr (void); -+ CORBA_PolicyTypeSeq *operator-> (void); -+ CORBA::PolicyType &operator[] (CORBA::ULong slot); - - private: -- PolicyManager_ptr ptr_; -- // Unimplemented - prevents widening assignment. -- PolicyManager_var (const TAO_Base_var &rhs); -- PolicyManager_var &operator= (const TAO_Base_var &rhs); -+ CORBA_PolicyTypeSeq *&ptr_; -+ // assignment from T_var not allowed -+ void operator= (const CORBA_PolicyTypeSeq_var &); - }; - -- --#endif /* end #if !defined */ -- -- --#if !defined (_CORBA_POLICYMANAGER___OUT_CH_) --#define _CORBA_POLICYMANAGER___OUT_CH_ -- --class TAO_Export PolicyManager_out -+class TAO_Export CORBA_PolicyManager_var : public TAO_Base_var - { - public: -- PolicyManager_out (PolicyManager_ptr &); -- PolicyManager_out (PolicyManager_var &); -- PolicyManager_out (const PolicyManager_out &); -- PolicyManager_out &operator= (const PolicyManager_out &); -- PolicyManager_out &operator= (const PolicyManager_var &); -- PolicyManager_out &operator= (PolicyManager_ptr); -- operator PolicyManager_ptr &(); -- PolicyManager_ptr &ptr (void); -- PolicyManager_ptr operator-> (void); -- --private: -- PolicyManager_ptr &ptr_; --}; -- - --#endif /* end #if !defined */ +-#if !defined (_CORBA_CURRENT_CH_) +-#define _CORBA_CURRENT_CH_ - -+ CORBA_PolicyManager_var (void); // default constructor -+ CORBA_PolicyManager_var (CORBA_PolicyManager_ptr); -+ CORBA_PolicyManager_var (const CORBA_PolicyManager_var &); -+ ~CORBA_PolicyManager_var (void); // destructor - --#if !defined (_CORBA_POLICYMANAGER_CH_) --#define _CORBA_POLICYMANAGER_CH_ -+ CORBA_PolicyManager_var &operator= (CORBA_PolicyManager_ptr); -+ CORBA_PolicyManager_var &operator= (const CORBA_PolicyManager_var &); -+ CORBA_PolicyManager_ptr operator-> (void) const; - --class TAO_Export PolicyManager : public virtual CORBA_Object +-class TAO_Export CORBA_Current : public virtual CORBA_Object -{ -public: -#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) -- typedef PolicyManager_ptr _ptr_type; -- typedef PolicyManager_var _var_type; +- typedef CORBA_Current_ptr _ptr_type; +- typedef CORBA_Current_var _var_type; -#endif /* ! __GNUC__ || g++ >= 2.8 */ - - // the static operations -- static PolicyManager_ptr _duplicate (PolicyManager_ptr obj); -- static PolicyManager_ptr _narrow ( +- static CORBA_Current_ptr _duplicate (CORBA_Current_ptr obj); +- static CORBA_Current_ptr _narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); -- static PolicyManager_ptr _unchecked_narrow ( +- static CORBA_Current_ptr _unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); -- static PolicyManager_ptr _nil (void) +- static CORBA_Current_ptr _nil (void) - { -- return (PolicyManager_ptr)0; +- return (CORBA_Current_ptr)0; - } -+ operator const CORBA_PolicyManager_ptr &() const; -+ operator CORBA_PolicyManager_ptr &(); -+ // in, inout, out, _retn -+ CORBA_PolicyManager_ptr in (void) const; -+ CORBA_PolicyManager_ptr &inout (void); -+ CORBA_PolicyManager_ptr &out (void); -+ CORBA_PolicyManager_ptr _retn (void); -+ CORBA_PolicyManager_ptr ptr (void) const; - -- static void _tao_any_destructor (void*); -- -- virtual CORBA::PolicyList * get_policy_overrides ( -- const CORBA::PolicyTypeSeq & ts, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -- ) -- ACE_THROW_SPEC (( -- CORBA::SystemException -- )); -- -- virtual void set_policy_overrides ( -- const CORBA::PolicyList & policies, -- CORBA::SetOverrideType set_add, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -- ) -- ACE_THROW_SPEC (( -- CORBA::SystemException, -- CORBA::InvalidPolicies -- )); - -- 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; - -protected: -- PolicyManager (void); -- PolicyManager (TAO_Stub *objref, -- TAO_ServantBase *_tao_servant = 0, -- CORBA::Boolean _tao_collocated = 0 -- ); -- virtual ~PolicyManager (void); - private: -- PolicyManager (const PolicyManager &); -- void operator= (const PolicyManager &); --}; -- -- --#endif /* end #if !defined */ -- --TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyManager; -- -- --#if !defined (_CORBA_CURRENT___PTR_CH_) --#define _CORBA_CURRENT___PTR_CH_ -- --class Current; --typedef Current *Current_ptr; -- --#endif /* end #if !defined */ -- -- --#if !defined (_CORBA_CURRENT___VAR_CH_) --#define _CORBA_CURRENT___VAR_CH_ -- --class TAO_Export Current_var : public TAO_Base_var --{ --public: -- Current_var (void); // default constructor -- Current_var (Current_ptr); -- Current_var (const Current_var &); // copy constructor -- ~Current_var (void); // destructor -- -- Current_var &operator= (Current_ptr); -- Current_var &operator= (const Current_var &); -- Current_ptr operator-> (void) const; -- -- operator const Current_ptr &() const; -- operator Current_ptr &(); -- // in, inout, out, _retn -- Current_ptr in (void) const; -- Current_ptr &inout (void); -- Current_ptr &out (void); -- Current_ptr _retn (void); -- Current_ptr ptr (void) const; -- +- CORBA_Current (void); +- virtual ~CORBA_Current (void); -private: -- Current_ptr ptr_; -+ CORBA_PolicyManager_ptr ptr_; - // Unimplemented - prevents widening assignment. -- Current_var (const TAO_Base_var &rhs); -- Current_var &operator= (const TAO_Base_var &rhs); -+ CORBA_PolicyManager_var (const TAO_Base_var &rhs); -+ CORBA_PolicyManager_var &operator= (const TAO_Base_var &rhs); - }; - -- --#endif /* end #if !defined */ -- -- --#if !defined (_CORBA_CURRENT___OUT_CH_) --#define _CORBA_CURRENT___OUT_CH_ -- --class TAO_Export Current_out -+class TAO_Export CORBA_PolicyManager_out - { - public: -- Current_out (Current_ptr &); -- Current_out (Current_var &); -- Current_out (const Current_out &); -- Current_out &operator= (const Current_out &); -- Current_out &operator= (const Current_var &); -- Current_out &operator= (Current_ptr); -- operator Current_ptr &(); -- Current_ptr &ptr (void); -- Current_ptr operator-> (void); -- -+ CORBA_PolicyManager_out (CORBA_PolicyManager_ptr &); -+ CORBA_PolicyManager_out (CORBA_PolicyManager_var &); -+ CORBA_PolicyManager_out (const CORBA_PolicyManager_out &); -+ CORBA_PolicyManager_out &operator= (const CORBA_PolicyManager_out &); -+ CORBA_PolicyManager_out &operator= (const CORBA_PolicyManager_var &); -+ CORBA_PolicyManager_out &operator= (CORBA_PolicyManager_ptr); -+ operator CORBA_PolicyManager_ptr &(); -+ CORBA_PolicyManager_ptr &ptr (void); -+ CORBA_PolicyManager_ptr operator-> (void); -+ - private: -- Current_ptr &ptr_; -+ CORBA_PolicyManager_ptr &ptr_; - }; - -- --#endif /* end #if !defined */ -- -- --#if !defined (_CORBA_CURRENT_CH_) --#define _CORBA_CURRENT_CH_ -- --class TAO_Export Current : public virtual CORBA_Object -+class TAO_Export CORBA_PolicyManager : public virtual CORBA_Object - { - public: --#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) -- typedef Current_ptr _ptr_type; -- typedef Current_var _var_type; --#endif /* ! __GNUC__ || g++ >= 2.8 */ -+#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 -+ typedef CORBA_PolicyManager_ptr _ptr_type; -+ typedef CORBA_PolicyManager_var _var_type; -+#endif /* __GNUC__ */ - - // the static operations -- static Current_ptr _duplicate (Current_ptr obj); -- static Current_ptr _narrow ( -- CORBA::Object_ptr obj, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -- ); -- static Current_ptr _unchecked_narrow ( -- CORBA::Object_ptr obj, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -- ); -- static Current_ptr _nil (void) -- { -- return (Current_ptr)0; -- } -- -+ static CORBA_PolicyManager_ptr _duplicate (CORBA_PolicyManager_ptr obj); -+ static CORBA_PolicyManager_ptr _narrow ( -+ CORBA::Object_ptr obj, -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ); -+ static CORBA_PolicyManager_ptr _nil (void); - static void _tao_any_destructor (void*); - -+ virtual CORBA_PolicyList * get_policy_overrides ( -+ const CORBA_PolicyTypeSeq & ts, -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ); -+ virtual void set_policy_overrides ( -+ const CORBA_PolicyList & policies, -+ CORBA::SetOverrideType set_add, -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ); - 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); -- -+ const CORBA::Char *type_id, -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ); - virtual const char* _interface_repository_id (void) const; -- - protected: -- Current (void); -- Current (TAO_Stub *objref, -- TAO_ServantBase *_tao_servant = 0, -- CORBA::Boolean _tao_collocated = 0 -- ); -- virtual ~Current (void); -+ CORBA_PolicyManager (void); // default constructor -+ CORBA_PolicyManager (TAO_Stub *objref, -+ TAO_ServantBase *_tao_servant = 0, -+ CORBA::Boolean _tao_collocated = 0 -+ ); -+ virtual ~CORBA_PolicyManager (void); - private: -- Current (const Current &); -- void operator= (const Current &); -+ CORBA_PolicyManager (const CORBA_PolicyManager &); -+ void operator= (const CORBA_PolicyManager &); - }; - -+// **************************************************************** - --#endif /* end #if !defined */ -- --TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Current; -- -- --#if !defined (_CORBA_POLICYCURRENT___PTR_CH_) --#define _CORBA_POLICYCURRENT___PTR_CH_ -- --class PolicyCurrent; --typedef PolicyCurrent *PolicyCurrent_ptr; -- --#endif /* end #if !defined */ -- -- --#if !defined (_CORBA_POLICYCURRENT___VAR_CH_) --#define _CORBA_POLICYCURRENT___VAR_CH_ -- --class TAO_Export PolicyCurrent_var : public TAO_Base_var -+class TAO_Export CORBA_PolicyCurrent_var : public TAO_Base_var - { - public: -- PolicyCurrent_var (void); // default constructor -- PolicyCurrent_var (PolicyCurrent_ptr); -- PolicyCurrent_var (const PolicyCurrent_var &); // copy constructor -- ~PolicyCurrent_var (void); // destructor -- -- PolicyCurrent_var &operator= (PolicyCurrent_ptr); -- PolicyCurrent_var &operator= (const PolicyCurrent_var &); -- PolicyCurrent_ptr operator-> (void) const; -- -- operator const PolicyCurrent_ptr &() const; -- operator PolicyCurrent_ptr &(); -- // in, inout, out, _retn -- PolicyCurrent_ptr in (void) const; -- PolicyCurrent_ptr &inout (void); -- PolicyCurrent_ptr &out (void); -- PolicyCurrent_ptr _retn (void); -- PolicyCurrent_ptr ptr (void) const; -+ CORBA_PolicyCurrent_var (void); // default constructor -+ CORBA_PolicyCurrent_var (CORBA_PolicyCurrent_ptr); -+ CORBA_PolicyCurrent_var (const CORBA_PolicyCurrent_var &); -+ ~CORBA_PolicyCurrent_var (void); // destructor -+ -+ CORBA_PolicyCurrent_var &operator= (CORBA_PolicyCurrent_ptr); -+ CORBA_PolicyCurrent_var &operator= (const CORBA_PolicyCurrent_var &); -+ CORBA_PolicyCurrent_ptr operator-> (void) const; -+ -+ operator const CORBA_PolicyCurrent_ptr &() const; -+ operator CORBA_PolicyCurrent_ptr &(); -+ // in, inout, out, _retn -+ CORBA_PolicyCurrent_ptr in (void) const; -+ CORBA_PolicyCurrent_ptr &inout (void); -+ CORBA_PolicyCurrent_ptr &out (void); -+ CORBA_PolicyCurrent_ptr _retn (void); -+ CORBA_PolicyCurrent_ptr ptr (void) const; - - private: -- PolicyCurrent_ptr ptr_; -+ CORBA_PolicyCurrent_ptr ptr_; - // Unimplemented - prevents widening assignment. -- PolicyCurrent_var (const TAO_Base_var &rhs); -- PolicyCurrent_var &operator= (const TAO_Base_var &rhs); -+ CORBA_PolicyCurrent_var (const TAO_Base_var &rhs); -+ CORBA_PolicyCurrent_var &operator= (const TAO_Base_var &rhs); - }; - -- --#endif /* end #if !defined */ -- -- --#if !defined (_CORBA_POLICYCURRENT___OUT_CH_) --#define _CORBA_POLICYCURRENT___OUT_CH_ -- --class TAO_Export PolicyCurrent_out -+class TAO_Export CORBA_PolicyCurrent_out - { - public: -- PolicyCurrent_out (PolicyCurrent_ptr &); -- PolicyCurrent_out (PolicyCurrent_var &); -- PolicyCurrent_out (const PolicyCurrent_out &); -- PolicyCurrent_out &operator= (const PolicyCurrent_out &); -- PolicyCurrent_out &operator= (const PolicyCurrent_var &); -- PolicyCurrent_out &operator= (PolicyCurrent_ptr); -- operator PolicyCurrent_ptr &(); -- PolicyCurrent_ptr &ptr (void); -- PolicyCurrent_ptr operator-> (void); -- -+ CORBA_PolicyCurrent_out (CORBA_PolicyCurrent_ptr &); -+ CORBA_PolicyCurrent_out (CORBA_PolicyCurrent_var &); -+ CORBA_PolicyCurrent_out (const CORBA_PolicyCurrent_out &); -+ CORBA_PolicyCurrent_out &operator= (const CORBA_PolicyCurrent_out &); -+ CORBA_PolicyCurrent_out &operator= (const CORBA_PolicyCurrent_var &); -+ CORBA_PolicyCurrent_out &operator= (CORBA_PolicyCurrent_ptr); -+ operator CORBA_PolicyCurrent_ptr &(); -+ CORBA_PolicyCurrent_ptr &ptr (void); -+ CORBA_PolicyCurrent_ptr operator-> (void); -+ - private: -- PolicyCurrent_ptr &ptr_; -+ CORBA_PolicyCurrent_ptr &ptr_; - }; - -- --#endif /* end #if !defined */ -- -- --#if !defined (_CORBA_POLICYCURRENT_CH_) --#define _CORBA_POLICYCURRENT_CH_ -- --class TAO_Export PolicyCurrent: public virtual PolicyManager, public virtual Current -+class TAO_Export CORBA_PolicyCurrent: public virtual CORBA_PolicyManager, public virtual CORBA_Current - { - public: --#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) -- typedef PolicyCurrent_ptr _ptr_type; -- typedef PolicyCurrent_var _var_type; --#endif /* ! __GNUC__ || g++ >= 2.8 */ -+#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8 -+ typedef CORBA_PolicyCurrent_ptr _ptr_type; -+ typedef CORBA_PolicyCurrent_var _var_type; -+#endif /* __GNUC__ */ - - // the static operations -- static PolicyCurrent_ptr _duplicate (PolicyCurrent_ptr obj); -- static PolicyCurrent_ptr _narrow ( -- CORBA::Object_ptr obj, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -- ); -- static PolicyCurrent_ptr _unchecked_narrow ( -- CORBA::Object_ptr obj, -- CORBA::Environment &ACE_TRY_ENV = -- TAO_default_environment () -- ); -- static PolicyCurrent_ptr _nil (void) -- { -- return (PolicyCurrent_ptr)0; -- } +- CORBA_Current (const CORBA_Current &); +- void operator= (const CORBA_Current &); +-}; - -+ static CORBA_PolicyCurrent_ptr _duplicate (CORBA_PolicyCurrent_ptr obj); -+ static CORBA_PolicyCurrent_ptr _narrow ( -+ CORBA::Object_ptr obj, -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ); -+ static CORBA_PolicyCurrent_ptr _nil (void); - static void _tao_any_destructor (void*); - - 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); -- -+ const CORBA::Char *type_id, -+ CORBA::Environment &ACE_TRY_ENV = -+ TAO_default_environment () -+ ); - virtual const char* _interface_repository_id (void) const; - - protected: -- PolicyCurrent (void); -- PolicyCurrent (TAO_Stub *objref, -- TAO_ServantBase *_tao_servant = 0, -- CORBA::Boolean _tao_collocated = 0 -- ); -- virtual ~PolicyCurrent (void); -+ CORBA_PolicyCurrent (void); // default constructor -+ CORBA_PolicyCurrent (TAO_Stub *objref, -+ TAO_ServantBase *_tao_servant = 0, -+ CORBA::Boolean _tao_collocated = 0 -+ ); -+ virtual ~CORBA_PolicyCurrent (void); - private: -- PolicyCurrent (const PolicyCurrent &); -- void operator= (const PolicyCurrent &); -+ CORBA_PolicyCurrent (const CORBA_PolicyCurrent &); -+ void operator= (const CORBA_PolicyCurrent &); - }; - -+// **************************************************************** - -#endif /* end #if !defined */ - --TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyCurrent; - -+TAO_Export void operator<<= (CORBA::Any &, -+ const CORBA::PolicyError &); -+TAO_Export void operator<<= (CORBA::Any &, -+ CORBA::PolicyError*); -+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, -+ CORBA::PolicyError *&); -+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, -+ const CORBA::PolicyError *&); -+TAO_Export void operator<<= (CORBA::Any &, -+ const CORBA::InvalidPolicies &); -+TAO_Export void operator<<= (CORBA::Any &, -+ CORBA::InvalidPolicies*); -+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, -+ CORBA::InvalidPolicies *&); -+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, -+ const CORBA::InvalidPolicies *&); + #if !defined (_CORBA_POLICYCURRENT___PTR_CH_) + #define _CORBA_POLICYCURRENT___PTR_CH_ --} --TAO_NAMESPACE_CLOSE // module CORBA -- --TAO_Export void operator<<= (CORBA::Any &, const CORBA::PolicyError &); // copying version --TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyError*); // noncopying version --TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyError *&); // deprecated --TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyError *&); --TAO_Export void operator<<= (CORBA::Any &, const CORBA::InvalidPolicies &); // copying version --TAO_Export void operator<<= (CORBA::Any &, CORBA::InvalidPolicies*); // noncopying version --TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InvalidPolicies *&); // deprecated --TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InvalidPolicies *&); --extern TAO_Export CORBA::Policy_ptr (*_TAO_collocation_CORBA_Policy_Stub_Factory_function_pointer) ( -- CORBA::Object_ptr obj -- ); - // Any operators for interface CORBA::Policy --TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr); --TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Policy *&); --TAO_Export void operator<<= (CORBA::Any &, const CORBA::PolicyList &); // copying version --TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyList*); // noncopying version --TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyList *&); // deprecated --TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyList *&); --TAO_Export void operator<<= (CORBA::Any &, const CORBA::PolicyTypeSeq &); // copying version --TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyTypeSeq*); // noncopying version --TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyTypeSeq *&); // deprecated --TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyTypeSeq *&); --TAO_Export void operator<<= (CORBA::Any &, CORBA::SetOverrideType); --TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::SetOverrideType &); --extern TAO_Export CORBA::PolicyManager_ptr (*_TAO_collocation_CORBA_PolicyManager_Stub_Factory_function_pointer) ( -- CORBA::Object_ptr obj -- ); --// Any operators for interface CORBA::PolicyManager --TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyManager_ptr); --TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyManager *&); --extern TAO_Export CORBA::Current_ptr (*_TAO_collocation_CORBA_Current_Stub_Factory_function_pointer) ( -- CORBA::Object_ptr obj -- ); --// Any operators for interface CORBA::Current --TAO_Export void operator<<= (CORBA::Any &, CORBA::Current_ptr); --TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current *&); --extern TAO_Export CORBA::PolicyCurrent_ptr (*_TAO_collocation_CORBA_PolicyCurrent_Stub_Factory_function_pointer) ( -- CORBA::Object_ptr obj -- ); --// Any operators for interface CORBA::PolicyCurrent --TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyCurrent_ptr); --TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyCurrent *&); -+TAO_Export void operator<<= (CORBA::Any &, -+ CORBA::Policy_ptr); -+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, -+ CORBA::Policy *&); -+TAO_Export void operator<<= (CORBA::Any &, -+ const CORBA::PolicyList &); -+TAO_Export void operator<<= (CORBA::Any &, -+ CORBA::PolicyList*); -+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, -+ CORBA::PolicyList *&); -+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, -+ const CORBA::PolicyList *&); -+TAO_Export void operator<<= (CORBA::Any &, -+ const CORBA::PolicyTypeSeq &); -+TAO_Export void operator<<= (CORBA::Any &, -+ CORBA::PolicyTypeSeq*); -+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, -+ CORBA::PolicyTypeSeq *&); -+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, -+ const CORBA::PolicyTypeSeq *&); -+TAO_Export void operator<<= (CORBA::Any &, -+ CORBA::SetOverrideType); -+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, -+ CORBA::SetOverrideType &); -+ -+TAO_Export void operator<<= (CORBA::Any &, -+ CORBA::PolicyManager_ptr); -+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, -+ CORBA::PolicyManager *&); -+TAO_Export void operator<<= (CORBA::Any &, -+ CORBA::PolicyCurrent_ptr); -+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, -+ CORBA::PolicyCurrent *&); +@@ -1206,7 +1083,7 @@ --#ifndef __ACE_INLINE__ -+// **************************************************************** -+ -+#if defined (__ACE_INLINE__) -+#include "tao/PolicyC.i" -+#else - TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PolicyError &); - TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PolicyError &); -- --# if !defined (ACE_LACKS_IOSTREAM_TOTALLY) -- --TAO_Export ostream& operator<< (ostream &, const CORBA::PolicyError &); -- --# endif /* ACE_LACKS_IOSTREAM_TOTALLY */ - TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InvalidPolicies &); - TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InvalidPolicies &); -- --#if !defined _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_H_ --#define _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_H_ -- --TAO_Export CORBA::Boolean operator<< ( -- TAO_OutputCDR &, -- const CORBA::InvalidPolicies::_tao_seq_UShort & -- ); --TAO_Export CORBA::Boolean operator>> ( -- TAO_InputCDR &, -- CORBA::InvalidPolicies::_tao_seq_UShort & -- ); -- --#endif /* _TAO_CDR_OP_CORBA_InvalidPolicies__tao_seq_UShort_H_ */ -- -- --# if !defined (ACE_LACKS_IOSTREAM_TOTALLY) -- --TAO_Export ostream& operator<< (ostream &, const CORBA::InvalidPolicies &); -- --# endif /* ACE_LACKS_IOSTREAM_TOTALLY */ -+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InvalidPolicies::_tao_seq_UShort &); -+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InvalidPolicies::_tao_seq_UShort &); - TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Policy_ptr ); - TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Policy_ptr &); -- --#if !defined _TAO_CDR_OP_CORBA_PolicyList_H_ --#define _TAO_CDR_OP_CORBA_PolicyList_H_ -- --TAO_Export CORBA::Boolean operator<< ( -- TAO_OutputCDR &, -- const CORBA::PolicyList & -- ); --TAO_Export CORBA::Boolean operator>> ( -- TAO_InputCDR &, -- CORBA::PolicyList & -- ); -- --#endif /* _TAO_CDR_OP_CORBA_PolicyList_H_ */ -- -- --#if !defined _TAO_CDR_OP_CORBA_PolicyTypeSeq_H_ --#define _TAO_CDR_OP_CORBA_PolicyTypeSeq_H_ -- --TAO_Export CORBA::Boolean operator<< ( -- TAO_OutputCDR &, -- const CORBA::PolicyTypeSeq & -- ); --TAO_Export CORBA::Boolean operator>> ( -- TAO_InputCDR &, -- CORBA::PolicyTypeSeq & -- ); -- --#endif /* _TAO_CDR_OP_CORBA_PolicyTypeSeq_H_ */ -- --TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::SetOverrideType &); // -+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PolicyList &); -+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PolicyList &); -+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PolicyTypeSeq &); -+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PolicyTypeSeq &); -+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::SetOverrideType &); - TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &); - TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PolicyManager_ptr ); - TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PolicyManager_ptr &); --TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Current_ptr ); --TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Current_ptr &); - TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PolicyCurrent_ptr ); - TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PolicyCurrent_ptr &); - --#endif /* __ACE_INLINE__ */ -- -- --#if defined (__ACE_INLINE__) + #if defined (__ACE_INLINE__) -#include "PolicyC.i" ++#include "tao/PolicyC.i" #endif /* defined INLINE */ --#if defined(_MSC_VER) && (_MSC_VER >= 1200) --#pragma warning(pop) --#endif /* _MSC_VER */ -- - #include "ace/post.h" --#endif /* ifndef */ -+#endif /* TAO_IDL_POLICYC_H */ + #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/tao/diffs/PolicyC.i.diff b/TAO/tao/diffs/PolicyC.i.diff index 17d5ad87e14..fea966f0588 100644 --- a/TAO/tao/diffs/PolicyC.i.diff +++ b/TAO/tao/diffs/PolicyC.i.diff @@ -1,8 +1,179 @@ -@@ -418,7 +418,2 @@ +--- PolicyC.i Tue Jul 11 00:38:13 2000 ++++ PolicyC.i.mod Tue Jul 11 00:29:58 2000 +@@ -1475,176 +1475,6 @@ + #endif /* end #if !defined */ + + +-#if !defined (_CORBA_CURRENT___VAR_CI_) +-#define _CORBA_CURRENT___VAR_CI_ +- +-// ************************************************************* +-// Inline operations for class CORBA_Current_var +-// ************************************************************* +- +-ACE_INLINE +-CORBA_Current_var::CORBA_Current_var (void) // default constructor +- : ptr_ (CORBA_Current::_nil ()) +-{} +- +-ACE_INLINE ::CORBA_Current_ptr +-CORBA_Current_var::ptr (void) const +-{ +- return this->ptr_; +-} +- +-ACE_INLINE +-CORBA_Current_var::CORBA_Current_var (const ::CORBA_Current_var &p) // copy constructor +- : TAO_Base_var (), +- ptr_ (CORBA_Current::_duplicate (p.ptr ())) +-{} +- +-ACE_INLINE +-CORBA_Current_var::~CORBA_Current_var (void) // destructor +-{ +- CORBA::release (this->ptr_); +-} +- +-ACE_INLINE CORBA_Current_var & +-CORBA_Current_var::operator= (CORBA_Current_ptr p) +-{ +- CORBA::release (this->ptr_); +- this->ptr_ = p; +- return *this; +-} +- +-ACE_INLINE CORBA_Current_var & +-CORBA_Current_var::operator= (const ::CORBA_Current_var &p) +-{ +- if (this != &p) +- { +- CORBA::release (this->ptr_); +- this->ptr_ = ::CORBA_Current::_duplicate (p.ptr ()); +- } +- return *this; +-} +- +-ACE_INLINE +-CORBA_Current_var::operator const ::CORBA_Current_ptr &() const // cast +-{ +- return this->ptr_; +-} +- +-ACE_INLINE +-CORBA_Current_var::operator ::CORBA_Current_ptr &() // cast +-{ +- return this->ptr_; +-} +- +-ACE_INLINE ::CORBA_Current_ptr +-CORBA_Current_var::operator-> (void) const +-{ +- return this->ptr_; +-} +- +-ACE_INLINE ::CORBA_Current_ptr +-CORBA_Current_var::in (void) const +-{ +- return this->ptr_; +-} +- +-ACE_INLINE ::CORBA_Current_ptr & +-CORBA_Current_var::inout (void) +-{ +- return this->ptr_; +-} +- +-ACE_INLINE ::CORBA_Current_ptr & +-CORBA_Current_var::out (void) +-{ +- CORBA::release (this->ptr_); +- this->ptr_ = ::CORBA_Current::_nil (); +- return this->ptr_; +-} +- +-ACE_INLINE ::CORBA_Current_ptr +-CORBA_Current_var::_retn (void) +-{ +- // yield ownership of managed obj reference +- ::CORBA_Current_ptr val = this->ptr_; +- this->ptr_ = ::CORBA_Current::_nil (); +- return val; +-} +- +- +-#endif /* end #if !defined */ +- +- +-#if !defined (_CORBA_CURRENT___OUT_CI_) +-#define _CORBA_CURRENT___OUT_CI_ +- +-// ************************************************************* +-// Inline operations for class CORBA_Current_out +-// ************************************************************* +- -ACE_INLINE --CORBA::Policy_var::Policy_var (Policy_ptr p) +-CORBA_Current_out::CORBA_Current_out (CORBA_Current_ptr &p) - : ptr_ (p) +-{ +- this->ptr_ = ::CORBA_Current::_nil (); +-} +- +-ACE_INLINE +-CORBA_Current_out::CORBA_Current_out (CORBA_Current_var &p) // constructor from _var +- : ptr_ (p.out ()) +-{ +- CORBA::release (this->ptr_); +- this->ptr_ = ::CORBA_Current::_nil (); +-} +- +-ACE_INLINE +-CORBA_Current_out::CORBA_Current_out (const ::CORBA_Current_out &p) // copy constructor +- : ptr_ (ACE_const_cast (CORBA_Current_out &, p).ptr_) -{} - -ACE_INLINE ::CORBA::Policy_ptr -CORBA::Policy_var::ptr (void) const +-ACE_INLINE ::CORBA_Current_out & +-CORBA_Current_out::operator= (const ::CORBA_Current_out &p) +-{ +- this->ptr_ = ACE_const_cast (CORBA_Current_out&, p).ptr_; +- return *this; +-} +- +-ACE_INLINE CORBA_Current_out & +-CORBA_Current_out::operator= (const ::CORBA_Current_var &p) +-{ +- this->ptr_ = ::CORBA_Current::_duplicate (p.ptr ()); +- return *this; +-} +- +-ACE_INLINE CORBA_Current_out & +-CORBA_Current_out::operator= (CORBA_Current_ptr p) +-{ +- this->ptr_ = p; +- return *this; +-} +- +-ACE_INLINE +-CORBA_Current_out::operator ::CORBA_Current_ptr &() // cast +-{ +- return this->ptr_; +-} +- +-ACE_INLINE ::CORBA_Current_ptr & +-CORBA_Current_out::ptr (void) // ptr +-{ +- return this->ptr_; +-} +- +-ACE_INLINE ::CORBA_Current_ptr +-CORBA_Current_out::operator-> (void) +-{ +- return this->ptr_; +-} +- +- +-#endif /* end #if !defined */ +- +- + #if !defined (_CORBA_POLICYCURRENT___VAR_CI_) + #define _CORBA_POLICYCURRENT___VAR_CI_ + diff --git a/TAO/tao/diffs/RTCORBAC.cpp.diff b/TAO/tao/diffs/RTCORBAC.cpp.diff index b2c29ceabea..57aa7cbd5b6 100644 --- a/TAO/tao/diffs/RTCORBAC.cpp.diff +++ b/TAO/tao/diffs/RTCORBAC.cpp.diff @@ -1,5 +1,5 @@ ---- orig/RTCORBAC.cpp Thu Jun 15 13:59:41 2000 -+++ RTCORBAC.cpp Fri Jun 9 13:00:53 2000 +--- orig/RTCORBAC.cpp Sat May 20 22:29:17 2000 ++++ RTCORBAC.cpp Fri Aug 18 20:40:33 2000 @@ -1,4 +1,4 @@ -/* -*- C++ -*- $Id$ */ +/* -*- C++ -*- $Id$ */ @@ -394,7 +394,7 @@ RTCORBA::ProtocolProperties_ptr RTCORBA::ProtocolProperties::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV -@@ -802,30 +762,40 @@ +@@ -802,30 +762,37 @@ void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, @@ -415,9 +415,6 @@ +////////////////////////////////////////////////////// +// CDR Encoding Support + -+// @@ Angelo, can you explain to me why these methods here return -+// true, while same methods in PolicyC.cpp return false? -+ +CORBA::Boolean +RTCORBA::ProtocolProperties::_tao_encode (TAO_OutputCDR &) { @@ -445,7 +442,7 @@ RTCORBA::TCPProtocolProperties_ptr RTCORBA::TCPProtocolProperties::_narrow ( CORBA::Object_ptr obj, -@@ -870,11 +840,11 @@ +@@ -870,11 +837,11 @@ void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, @@ -459,7 +456,7 @@ retv = ACE_reinterpret_cast ( void *, -@@ -887,7 +857,7 @@ +@@ -887,7 +854,7 @@ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); @@ -468,7 +465,7 @@ if (retv) this->_add_ref (); return retv; -@@ -898,15 +868,6 @@ +@@ -898,15 +865,6 @@ return "IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0"; } @@ -484,7 +481,7 @@ RTCORBA::GIOPProtocolProperties_ptr RTCORBA::GIOPProtocolProperties::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV -@@ -950,11 +911,11 @@ +@@ -950,11 +908,11 @@ void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, @@ -498,7 +495,7 @@ retv = ACE_reinterpret_cast ( void *, -@@ -967,7 +928,7 @@ +@@ -967,7 +925,7 @@ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); @@ -507,8 +504,169 @@ if (retv) this->_add_ref (); return retv; -@@ -980,7 +941,7 @@ +@@ -978,9 +936,168 @@ + return "IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0"; + } ++// default constructor ++RTCORBA::UnixDomainProtocolProperties::UnixDomainProtocolProperties (void) ++{} ++ ++// destructor ++RTCORBA::UnixDomainProtocolProperties::~UnixDomainProtocolProperties (void) ++{} ++ ++RTCORBA::UnixDomainProtocolProperties_ptr RTCORBA::UnixDomainProtocolProperties::_narrow ( ++ CORBA::Object_ptr obj, ++ CORBA::Environment &ACE_TRY_ENV ++ ) ++{ ++ return UnixDomainProtocolProperties::_unchecked_narrow (obj, ACE_TRY_ENV); ++} ++ ++RTCORBA::UnixDomainProtocolProperties_ptr RTCORBA::UnixDomainProtocolProperties::_unchecked_narrow ( ++ CORBA::Object_ptr obj, ++ CORBA::Environment & ++ ) ++{ ++ if (CORBA::is_nil (obj)) ++ return UnixDomainProtocolProperties::_nil (); ++ return ++ ACE_reinterpret_cast ++ ( ++ UnixDomainProtocolProperties_ptr, ++ obj->_tao_QueryInterface ++ ( ++ ACE_reinterpret_cast ++ ( ++ ptr_arith_t, ++ &UnixDomainProtocolProperties::_narrow ++ ) ++ ) ++ ); ++} ++ ++RTCORBA::UnixDomainProtocolProperties_ptr ++RTCORBA::UnixDomainProtocolProperties::_duplicate (UnixDomainProtocolProperties_ptr obj) ++{ ++ if (!CORBA::is_nil (obj)) ++ obj->_add_ref (); ++ return obj; ++} ++ ++void *RTCORBA::UnixDomainProtocolProperties::_tao_QueryInterface (ptr_arith_t type) ++{ ++ void *retv = 0; ++ if (type == ACE_reinterpret_cast ++ (ptr_arith_t, ++ &RTCORBA::UnixDomainProtocolProperties::_narrow)) ++ retv = ACE_reinterpret_cast (void*, this); ++ else if (type == ACE_reinterpret_cast ++ (ptr_arith_t, ++ &RTCORBA::ProtocolProperties::_narrow)) ++ retv = ACE_reinterpret_cast ++ ( ++ void *, ++ ACE_static_cast ++ ( ++ RTCORBA::ProtocolProperties_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* RTCORBA::UnixDomainProtocolProperties::_interface_repository_id (void) const ++{ ++ return "IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0"; ++} ++ ++ ++// default constructor ++RTCORBA::SharedMemoryProtocolProperties::SharedMemoryProtocolProperties (void) ++{} ++ ++// destructor ++RTCORBA::SharedMemoryProtocolProperties::~SharedMemoryProtocolProperties (void) ++{} ++ ++RTCORBA::SharedMemoryProtocolProperties_ptr RTCORBA::SharedMemoryProtocolProperties::_narrow ( ++ CORBA::Object_ptr obj, ++ CORBA::Environment &ACE_TRY_ENV ++ ) ++{ ++ return SharedMemoryProtocolProperties::_unchecked_narrow (obj, ACE_TRY_ENV); ++} ++ ++RTCORBA::SharedMemoryProtocolProperties_ptr RTCORBA::SharedMemoryProtocolProperties::_unchecked_narrow ( ++ CORBA::Object_ptr obj, ++ CORBA::Environment & ++ ) ++{ ++ if (CORBA::is_nil (obj)) ++ return SharedMemoryProtocolProperties::_nil (); ++ return ++ ACE_reinterpret_cast ++ ( ++ SharedMemoryProtocolProperties_ptr, ++ obj->_tao_QueryInterface ++ ( ++ ACE_reinterpret_cast ++ ( ++ ptr_arith_t, ++ &SharedMemoryProtocolProperties::_narrow ++ ) ++ ) ++ ); ++} ++ ++RTCORBA::SharedMemoryProtocolProperties_ptr ++RTCORBA::SharedMemoryProtocolProperties::_duplicate (SharedMemoryProtocolProperties_ptr obj) ++{ ++ if (!CORBA::is_nil (obj)) ++ obj->_add_ref (); ++ return obj; ++} ++ ++void *RTCORBA::SharedMemoryProtocolProperties::_tao_QueryInterface (ptr_arith_t type) ++{ ++ void *retv = 0; ++ if (type == ACE_reinterpret_cast ++ (ptr_arith_t, ++ &RTCORBA::SharedMemoryProtocolProperties::_narrow)) ++ retv = ACE_reinterpret_cast (void*, this); ++ else if (type == ACE_reinterpret_cast ++ (ptr_arith_t, ++ &RTCORBA::ProtocolProperties::_narrow)) ++ retv = ACE_reinterpret_cast ++ ( ++ void *, ++ ACE_static_cast ++ ( ++ RTCORBA::ProtocolProperties_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* RTCORBA::SharedMemoryProtocolProperties::_interface_repository_id (void) const ++{ ++ return "IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0"; ++} ++ #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - @@ -516,7 +674,7 @@ #if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CS_) #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CS_ -@@ -989,43 +950,43 @@ +@@ -989,43 +1106,43 @@ { RTCORBA::Protocol* tmp = 0; tmp = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (length); @@ -572,7 +730,7 @@ #if !defined (_RTCORBA_PROTOCOLLIST_CS_) #define _RTCORBA_PROTOCOLLIST_CS_ -@@ -1037,30 +998,30 @@ +@@ -1037,30 +1154,30 @@ RTCORBA::ProtocolList::ProtocolList (void) {} RTCORBA::ProtocolList::ProtocolList (CORBA::ULong max) // uses max size @@ -609,7 +767,7 @@ (seq) {} RTCORBA::ProtocolList::~ProtocolList (void) // dtor -@@ -1078,15 +1039,6 @@ +@@ -1078,15 +1195,6 @@ TAO_NAMESPACE_BEGIN (RTCORBA) TAO_NAMESPACE_DEFINE (const CORBA::ULong, SERVER_PROTOCOL_POLICY_TYPE, 1413545988U) TAO_NAMESPACE_END @@ -625,7 +783,7 @@ RTCORBA::ServerProtocolPolicy_ptr RTCORBA::ServerProtocolPolicy::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV -@@ -1130,11 +1082,11 @@ +@@ -1130,11 +1238,11 @@ void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, @@ -639,7 +797,7 @@ retv = ACE_reinterpret_cast ( void *, -@@ -1147,7 +1099,7 @@ +@@ -1147,7 +1255,7 @@ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); @@ -648,7 +806,7 @@ if (retv) this->_add_ref (); return retv; -@@ -1162,15 +1114,6 @@ +@@ -1162,15 +1270,6 @@ TAO_NAMESPACE_BEGIN (RTCORBA) TAO_NAMESPACE_DEFINE (const CORBA::ULong, CLIENT_PROTOCOL_POLICY_TYPE, 1413545989U) TAO_NAMESPACE_END @@ -664,7 +822,7 @@ RTCORBA::ClientProtocolPolicy_ptr RTCORBA::ClientProtocolPolicy::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV -@@ -1214,11 +1157,11 @@ +@@ -1214,11 +1313,11 @@ void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, @@ -678,7 +836,7 @@ retv = ACE_reinterpret_cast ( void *, -@@ -1231,7 +1174,7 @@ +@@ -1231,7 +1330,7 @@ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); @@ -687,7 +845,7 @@ if (retv) this->_add_ref (); return retv; -@@ -1242,15 +1185,6 @@ +@@ -1242,15 +1341,6 @@ return "IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0"; } @@ -703,7 +861,7 @@ RTCORBA::Current_ptr RTCORBA::Current::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV -@@ -1294,11 +1228,11 @@ +@@ -1294,11 +1384,11 @@ void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, @@ -717,7 +875,7 @@ retv = ACE_reinterpret_cast ( void *, -@@ -1311,7 +1245,7 @@ +@@ -1311,7 +1401,7 @@ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); @@ -726,7 +884,7 @@ if (retv) this->_add_ref (); return retv; -@@ -1322,15 +1256,6 @@ +@@ -1322,15 +1412,6 @@ return "IDL:omg.org/RTCORBA/Current:1.0"; } @@ -742,7 +900,7 @@ RTCORBA::Mutex_ptr RTCORBA::Mutex::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV -@@ -1374,12 +1299,12 @@ +@@ -1374,12 +1455,12 @@ void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, @@ -757,7 +915,7 @@ if (retv) this->_add_ref (); return retv; -@@ -1390,15 +1315,6 @@ +@@ -1390,15 +1471,6 @@ return "IDL:omg.org/RTCORBA/Mutex:1.0"; } @@ -773,7 +931,19 @@ RTCORBA::RTORB_ptr RTCORBA::RTORB::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV -@@ -1464,7 +1380,7 @@ +@@ -1449,9 +1521,9 @@ + + // copy constructor + RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (const ::RTCORBA::RTORB::InvalidThreadpool &_tao_excp) +- : CORBA_UserException (_tao_excp._type ()) ++ : CORBA_UserException (_tao_excp._id ()) + { +- } ++} + + // assignment operator + RTCORBA::RTORB::InvalidThreadpool& +@@ -1464,7 +1536,7 @@ // narrow RTCORBA::RTORB::InvalidThreadpool * @@ -782,7 +952,7 @@ { if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0", exc->_id ())) // same type return ACE_dynamic_cast (InvalidThreadpool *, exc); -@@ -1507,12 +1423,12 @@ +@@ -1507,12 +1579,12 @@ void *retv = 0; if (type == ACE_reinterpret_cast (ptr_arith_t, @@ -797,7 +967,28 @@ if (retv) this->_add_ref (); return retv; -@@ -2014,7 +1930,7 @@ +@@ -1952,6 +2024,20 @@ + + #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) ++ template class TAO_Object_Manager; ++ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) ++ # pragma instantiate TAO_Object_Manager ++#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ ++ ++#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ ++ defined (ACE_HAS_GNU_REPO) ++ template class TAO_Object_Manager; ++ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) ++ # pragma instantiate TAO_Object_Manager ++#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ ++ ++#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ ++ defined (ACE_HAS_GNU_REPO) + template class TAO_Object_Manager; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) + # pragma instantiate TAO_Object_Manager +@@ -2014,7 +2100,7 @@ // set the length of the sequence _tao_sequence.length (_tao_seq_len); // If length is 0 we return true. @@ -806,7 +997,7 @@ return 1; // retrieve all the elements CORBA::Boolean _tao_marshal_flag = 1; -@@ -2056,7 +1972,7 @@ +@@ -2056,7 +2142,7 @@ // set the length of the sequence _tao_sequence.length (_tao_seq_len); // If length is 0 we return true. @@ -815,7 +1006,7 @@ return 1; // retrieve all the elements CORBA::Boolean _tao_marshal_flag = 1; -@@ -2069,3 +1985,4 @@ +@@ -2069,3 +2155,4 @@ return 0; // error } diff --git a/TAO/tao/diffs/RTCORBAC.h.diff b/TAO/tao/diffs/RTCORBAC.h.diff index 9f8ecbed4bc..9fd89995df2 100644 --- a/TAO/tao/diffs/RTCORBAC.h.diff +++ b/TAO/tao/diffs/RTCORBAC.h.diff @@ -1,5 +1,5 @@ ---- orig/RTCORBAC.h Thu Jun 15 13:59:40 2000 -+++ RTCORBAC.h Fri Jun 9 13:00:53 2000 +--- orig/RTCORBAC.h Sat May 20 22:29:17 2000 ++++ RTCORBAC.h Fri Aug 18 20:19:34 2000 @@ -1,4 +1,4 @@ -/* -*- C++ -*- $Id$ */ +/* -*- C++ -*- $Id$ */ @@ -692,9 +692,9 @@ + // CDR Encoder/Decoder methods. + + virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr); -+ ++ + virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr); -+ ++ protected: ProtocolProperties (void); virtual ~ProtocolProperties (void); @@ -908,8 +908,320 @@ virtual const char* _interface_repository_id (void) const; protected: -@@ -1385,7 +1399,7 @@ +@@ -1383,9 +1397,319 @@ + + #endif /* end #if !defined */ ++ ++ ++#if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___PTR_CH_) ++#define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___PTR_CH_ ++ ++ class UnixDomainProtocolProperties; ++ typedef UnixDomainProtocolProperties *UnixDomainProtocolProperties_ptr; ++ ++#endif /* end #if !defined */ ++ ++ ++#if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___VAR_CH_) ++#define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___VAR_CH_ ++ ++ class TAO_Export UnixDomainProtocolProperties_var : public TAO_Base_var ++ { ++ public: ++ UnixDomainProtocolProperties_var (void); // default constructor ++ UnixDomainProtocolProperties_var (UnixDomainProtocolProperties_ptr p) : ptr_ (p) {} ++ UnixDomainProtocolProperties_var (const UnixDomainProtocolProperties_var &); // copy constructor ++ ~UnixDomainProtocolProperties_var (void); // destructor ++ ++ UnixDomainProtocolProperties_var &operator= (UnixDomainProtocolProperties_ptr); ++ UnixDomainProtocolProperties_var &operator= (const UnixDomainProtocolProperties_var &); ++ UnixDomainProtocolProperties_ptr operator-> (void) const; ++ ++ operator const UnixDomainProtocolProperties_ptr &() const; ++ operator UnixDomainProtocolProperties_ptr &(); ++ // in, inout, out, _retn ++ UnixDomainProtocolProperties_ptr in (void) const; ++ UnixDomainProtocolProperties_ptr &inout (void); ++ UnixDomainProtocolProperties_ptr &out (void); ++ UnixDomainProtocolProperties_ptr _retn (void); ++ UnixDomainProtocolProperties_ptr ptr (void) const; ++ ++ private: ++ UnixDomainProtocolProperties_ptr ptr_; ++ // Unimplemented - prevents widening assignment. ++ UnixDomainProtocolProperties_var (const TAO_Base_var &rhs); ++ UnixDomainProtocolProperties_var &operator= (const TAO_Base_var &rhs); ++ }; ++ ++ ++#endif /* end #if !defined */ ++ ++ ++#if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___OUT_CH_) ++#define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___OUT_CH_ ++ ++ class TAO_Export UnixDomainProtocolProperties_out ++ { ++ public: ++ UnixDomainProtocolProperties_out (UnixDomainProtocolProperties_ptr &); ++ UnixDomainProtocolProperties_out (UnixDomainProtocolProperties_var &); ++ UnixDomainProtocolProperties_out (const UnixDomainProtocolProperties_out &); ++ UnixDomainProtocolProperties_out &operator= (const UnixDomainProtocolProperties_out &); ++ UnixDomainProtocolProperties_out &operator= (const UnixDomainProtocolProperties_var &); ++ UnixDomainProtocolProperties_out &operator= (UnixDomainProtocolProperties_ptr); ++ operator UnixDomainProtocolProperties_ptr &(); ++ UnixDomainProtocolProperties_ptr &ptr (void); ++ UnixDomainProtocolProperties_ptr operator-> (void); ++ ++ private: ++ UnixDomainProtocolProperties_ptr &ptr_; ++ }; ++ ++ ++#endif /* end #if !defined */ ++ ++ ++#if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_) ++#define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_ ++ ++class TAO_Export UnixDomainProtocolProperties: public virtual ProtocolProperties ++ { ++ public: ++ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) ++ typedef UnixDomainProtocolProperties_ptr _ptr_type; ++ typedef UnixDomainProtocolProperties_var _var_type; ++ #endif /* ! __GNUC__ || g++ >= 2.8 */ ++ ++ // the static operations ++ static UnixDomainProtocolProperties_ptr _duplicate (UnixDomainProtocolProperties_ptr obj); ++ static UnixDomainProtocolProperties_ptr _narrow ( ++ CORBA::Object_ptr obj, ++ CORBA::Environment &ACE_TRY_ENV = ++ TAO_default_environment () ++ ); ++ static UnixDomainProtocolProperties_ptr _unchecked_narrow ( ++ CORBA::Object_ptr obj, ++ CORBA::Environment &ACE_TRY_ENV = ++ TAO_default_environment () ++ ); ++ static UnixDomainProtocolProperties_ptr _nil (void) ++ { ++ return (UnixDomainProtocolProperties_ptr)0; ++ } ++ ++ virtual CORBA::Long send_buffer_size ( ++ CORBA::Environment &ACE_TRY_ENV = ++ TAO_default_environment () ++ ) ++ ACE_THROW_SPEC (( ++ CORBA::SystemException ++ )) = 0; ++ ++ virtual void send_buffer_size ( ++ CORBA::Long send_buffer_size, ++ CORBA::Environment &ACE_TRY_ENV = ++ TAO_default_environment () ++ ) ++ ACE_THROW_SPEC (( ++ CORBA::SystemException ++ )) = 0; ++ ++ virtual CORBA::Long recv_buffer_size ( ++ CORBA::Environment &ACE_TRY_ENV = ++ TAO_default_environment () ++ ) ++ ACE_THROW_SPEC (( ++ CORBA::SystemException ++ )) = 0; ++ ++ virtual void recv_buffer_size ( ++ CORBA::Long recv_buffer_size, ++ CORBA::Environment &ACE_TRY_ENV = ++ TAO_default_environment () ++ ) ++ ACE_THROW_SPEC (( ++ CORBA::SystemException ++ )) = 0; ++ ++ virtual void *_tao_QueryInterface (ptr_arith_t type); ++ ++ virtual const char* _interface_repository_id (void) const; ++ ++ protected: ++ UnixDomainProtocolProperties (void); ++ virtual ~UnixDomainProtocolProperties (void); ++ private: ++ UnixDomainProtocolProperties (const UnixDomainProtocolProperties &); ++ void operator= (const UnixDomainProtocolProperties &); ++ }; ++ ++ ++#endif /* end #if !defined */ ++ ++ ++#if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___PTR_CH_) ++#define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___PTR_CH_ ++ ++ class SharedMemoryProtocolProperties; ++ typedef SharedMemoryProtocolProperties *SharedMemoryProtocolProperties_ptr; ++ ++#endif /* end #if !defined */ ++ ++ ++#if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___VAR_CH_) ++#define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___VAR_CH_ ++ ++ class TAO_Export SharedMemoryProtocolProperties_var : public TAO_Base_var ++ { ++ public: ++ SharedMemoryProtocolProperties_var (void); // default constructor ++ SharedMemoryProtocolProperties_var (SharedMemoryProtocolProperties_ptr p) : ptr_ (p) {} ++ SharedMemoryProtocolProperties_var (const SharedMemoryProtocolProperties_var &); // copy constructor ++ ~SharedMemoryProtocolProperties_var (void); // destructor ++ ++ SharedMemoryProtocolProperties_var &operator= (SharedMemoryProtocolProperties_ptr); ++ SharedMemoryProtocolProperties_var &operator= (const SharedMemoryProtocolProperties_var &); ++ SharedMemoryProtocolProperties_ptr operator-> (void) const; ++ ++ operator const SharedMemoryProtocolProperties_ptr &() const; ++ operator SharedMemoryProtocolProperties_ptr &(); ++ // in, inout, out, _retn ++ SharedMemoryProtocolProperties_ptr in (void) const; ++ SharedMemoryProtocolProperties_ptr &inout (void); ++ SharedMemoryProtocolProperties_ptr &out (void); ++ SharedMemoryProtocolProperties_ptr _retn (void); ++ SharedMemoryProtocolProperties_ptr ptr (void) const; ++ ++ private: ++ SharedMemoryProtocolProperties_ptr ptr_; ++ // Unimplemented - prevents widening assignment. ++ SharedMemoryProtocolProperties_var (const TAO_Base_var &rhs); ++ SharedMemoryProtocolProperties_var &operator= (const TAO_Base_var &rhs); ++ }; ++ ++ ++#endif /* end #if !defined */ ++ ++ ++#if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___OUT_CH_) ++#define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___OUT_CH_ ++ ++ class TAO_Export SharedMemoryProtocolProperties_out ++ { ++ public: ++ SharedMemoryProtocolProperties_out (SharedMemoryProtocolProperties_ptr &); ++ SharedMemoryProtocolProperties_out (SharedMemoryProtocolProperties_var &); ++ SharedMemoryProtocolProperties_out (const SharedMemoryProtocolProperties_out &); ++ SharedMemoryProtocolProperties_out &operator= (const SharedMemoryProtocolProperties_out &); ++ SharedMemoryProtocolProperties_out &operator= (const SharedMemoryProtocolProperties_var &); ++ SharedMemoryProtocolProperties_out &operator= (SharedMemoryProtocolProperties_ptr); ++ operator SharedMemoryProtocolProperties_ptr &(); ++ SharedMemoryProtocolProperties_ptr &ptr (void); ++ SharedMemoryProtocolProperties_ptr operator-> (void); ++ ++ private: ++ SharedMemoryProtocolProperties_ptr &ptr_; ++ }; ++ ++ ++#endif /* end #if !defined */ ++ ++ ++#if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_) ++#define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_ ++ ++class TAO_Export SharedMemoryProtocolProperties: public virtual ProtocolProperties ++ { ++ public: ++ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) ++ typedef SharedMemoryProtocolProperties_ptr _ptr_type; ++ typedef SharedMemoryProtocolProperties_var _var_type; ++ #endif /* ! __GNUC__ || g++ >= 2.8 */ ++ ++ // the static operations ++ static SharedMemoryProtocolProperties_ptr _duplicate (SharedMemoryProtocolProperties_ptr obj); ++ static SharedMemoryProtocolProperties_ptr _narrow ( ++ CORBA::Object_ptr obj, ++ CORBA::Environment &ACE_TRY_ENV = ++ TAO_default_environment () ++ ); ++ static SharedMemoryProtocolProperties_ptr _unchecked_narrow ( ++ CORBA::Object_ptr obj, ++ CORBA::Environment &ACE_TRY_ENV = ++ TAO_default_environment () ++ ); ++ static SharedMemoryProtocolProperties_ptr _nil (void) ++ { ++ return (SharedMemoryProtocolProperties_ptr)0; ++ } ++ ++ virtual CORBA::Long preallocate_buffer_size ( ++ CORBA::Environment &ACE_TRY_ENV = ++ TAO_default_environment () ++ ) ++ ACE_THROW_SPEC (( ++ CORBA::SystemException ++ )) = 0; ++ ++ virtual void preallocate_buffer_size ( ++ CORBA::Long preallocate_buffer_size, ++ CORBA::Environment &ACE_TRY_ENV = ++ TAO_default_environment () ++ ) ++ ACE_THROW_SPEC (( ++ CORBA::SystemException ++ )) = 0; ++ ++ virtual char * mmap_filename ( ++ CORBA::Environment &ACE_TRY_ENV = ++ TAO_default_environment () ++ ) ++ ACE_THROW_SPEC (( ++ CORBA::SystemException ++ )) = 0; ++ ++ virtual void mmap_filename ( ++ const char * mmap_filename, ++ CORBA::Environment &ACE_TRY_ENV = ++ TAO_default_environment () ++ ) ++ ACE_THROW_SPEC (( ++ CORBA::SystemException ++ )) = 0; ++ ++ virtual char * mmap_lockname ( ++ CORBA::Environment &ACE_TRY_ENV = ++ TAO_default_environment () ++ ) ++ ACE_THROW_SPEC (( ++ CORBA::SystemException ++ )) = 0; ++ ++ virtual void mmap_lockname ( ++ const char * mmap_lockname, ++ CORBA::Environment &ACE_TRY_ENV = ++ TAO_default_environment () ++ ) ++ ACE_THROW_SPEC (( ++ CORBA::SystemException ++ )) = 0; ++ ++ virtual void *_tao_QueryInterface (ptr_arith_t type); ++ ++ virtual const char* _interface_repository_id (void) const; ++ ++ protected: ++ SharedMemoryProtocolProperties (void); ++ virtual ~SharedMemoryProtocolProperties (void); ++ private: ++ SharedMemoryProtocolProperties (const SharedMemoryProtocolProperties &); ++ void operator= (const SharedMemoryProtocolProperties &); ++ }; ++ ++ ++#endif /* end #if !defined */ ++ struct Protocol; class Protocol_var; - @@ -917,7 +1229,7 @@ struct TAO_Export Protocol { -@@ -1405,18 +1419,18 @@ +@@ -1405,18 +1729,18 @@ Protocol_var (Protocol *); Protocol_var (const Protocol_var &); // copy constructor ~Protocol_var (void); // destructor @@ -940,7 +1252,7 @@ const Protocol &in (void) const; Protocol &inout (void); Protocol *&out (void); -@@ -1438,7 +1452,7 @@ +@@ -1438,7 +1762,7 @@ operator Protocol *&(); Protocol *&ptr (void); Protocol *operator-> (void); @@ -949,7 +1261,7 @@ private: Protocol *&ptr_; // assignment from T_var not allowed -@@ -1447,7 +1461,7 @@ +@@ -1447,7 +1771,7 @@ #if !defined (TAO_USE_SEQUENCE_TEMPLATES) @@ -958,7 +1270,7 @@ #if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CH_) #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CH_ -@@ -1455,9 +1469,9 @@ +@@ -1455,9 +1779,9 @@ { public: // = Initialization and termination methods. @@ -970,7 +1282,7 @@ _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum, CORBA::ULong length, Protocol *data, -@@ -1474,7 +1488,7 @@ +@@ -1474,7 +1798,7 @@ virtual void _allocate_buffer (CORBA::ULong length); virtual void _deallocate_buffer (void); // Implement the TAO_Base_Sequence methods (see Sequence.h) @@ -979,7 +1291,7 @@ Protocol *get_buffer (CORBA::Boolean orphan = 0); const Protocol *get_buffer (void) const; void replace (CORBA::ULong max, -@@ -1486,32 +1500,32 @@ +@@ -1486,32 +1810,32 @@ #endif /* end #if !defined */ @@ -1021,7 +1333,7 @@ CORBA::Boolean release=0 ); ProtocolList (const ProtocolList &); // copy ctor -@@ -1523,7 +1537,7 @@ +@@ -1523,7 +1847,7 @@ #endif /* ! __GNUC__ || g++ >= 2.8 */ }; @@ -1030,7 +1342,7 @@ #endif /* end #if !defined */ -@@ -1541,19 +1555,19 @@ +@@ -1541,19 +1865,19 @@ ProtocolList_var (ProtocolList *); ProtocolList_var (const ProtocolList_var &); // copy constructor ~ProtocolList_var (void); // destructor @@ -1054,7 +1366,7 @@ const ProtocolList &in (void) const; ProtocolList &inout (void); ProtocolList *&out (void); -@@ -1583,7 +1597,7 @@ +@@ -1583,7 +1907,7 @@ ProtocolList *&ptr (void); ProtocolList *operator-> (void); Protocol &operator[] (CORBA::ULong index); @@ -1063,7 +1375,7 @@ private: ProtocolList *&ptr_; // assignment from T_var not allowed -@@ -1601,7 +1615,7 @@ +@@ -1601,7 +1925,7 @@ class ServerProtocolPolicy; typedef ServerProtocolPolicy *ServerProtocolPolicy_ptr; @@ -1072,7 +1384,7 @@ #endif /* end #if !defined */ -@@ -1615,14 +1629,14 @@ +@@ -1615,14 +1939,14 @@ ServerProtocolPolicy_var (ServerProtocolPolicy_ptr); ServerProtocolPolicy_var (const ServerProtocolPolicy_var &); // copy constructor ~ServerProtocolPolicy_var (void); // destructor @@ -1090,7 +1402,7 @@ ServerProtocolPolicy_ptr in (void) const; ServerProtocolPolicy_ptr &inout (void); ServerProtocolPolicy_ptr &out (void); -@@ -1655,7 +1669,7 @@ +@@ -1655,7 +1979,7 @@ operator ServerProtocolPolicy_ptr &(); ServerProtocolPolicy_ptr &ptr (void); ServerProtocolPolicy_ptr operator-> (void); @@ -1099,7 +1411,7 @@ private: ServerProtocolPolicy_ptr &ptr_; }; -@@ -1679,12 +1693,12 @@ +@@ -1679,12 +2003,12 @@ static ServerProtocolPolicy_ptr _duplicate (ServerProtocolPolicy_ptr obj); static ServerProtocolPolicy_ptr _narrow ( CORBA::Object_ptr obj, @@ -1114,7 +1426,7 @@ TAO_default_environment () ); static ServerProtocolPolicy_ptr _nil (void) -@@ -1693,7 +1707,7 @@ +@@ -1693,7 +2017,7 @@ } virtual RTCORBA::ProtocolList * protocols ( @@ -1123,7 +1435,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -1701,7 +1715,7 @@ +@@ -1701,7 +2025,7 @@ )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1132,7 +1444,7 @@ virtual const char* _interface_repository_id (void) const; protected: -@@ -1723,7 +1737,7 @@ +@@ -1723,7 +2047,7 @@ class ClientProtocolPolicy; typedef ClientProtocolPolicy *ClientProtocolPolicy_ptr; @@ -1141,7 +1453,7 @@ #endif /* end #if !defined */ -@@ -1737,14 +1751,14 @@ +@@ -1737,14 +2061,14 @@ ClientProtocolPolicy_var (ClientProtocolPolicy_ptr); ClientProtocolPolicy_var (const ClientProtocolPolicy_var &); // copy constructor ~ClientProtocolPolicy_var (void); // destructor @@ -1159,7 +1471,7 @@ ClientProtocolPolicy_ptr in (void) const; ClientProtocolPolicy_ptr &inout (void); ClientProtocolPolicy_ptr &out (void); -@@ -1777,7 +1791,7 @@ +@@ -1777,7 +2101,7 @@ operator ClientProtocolPolicy_ptr &(); ClientProtocolPolicy_ptr &ptr (void); ClientProtocolPolicy_ptr operator-> (void); @@ -1168,7 +1480,7 @@ private: ClientProtocolPolicy_ptr &ptr_; }; -@@ -1801,12 +1815,12 @@ +@@ -1801,12 +2125,12 @@ static ClientProtocolPolicy_ptr _duplicate (ClientProtocolPolicy_ptr obj); static ClientProtocolPolicy_ptr _narrow ( CORBA::Object_ptr obj, @@ -1183,7 +1495,7 @@ TAO_default_environment () ); static ClientProtocolPolicy_ptr _nil (void) -@@ -1815,7 +1829,7 @@ +@@ -1815,7 +2139,7 @@ } virtual RTCORBA::ProtocolList * protocols ( @@ -1192,7 +1504,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -1823,7 +1837,7 @@ +@@ -1823,7 +2147,7 @@ )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1201,7 +1513,7 @@ virtual const char* _interface_repository_id (void) const; protected: -@@ -1843,7 +1857,7 @@ +@@ -1843,7 +2167,7 @@ class Current; typedef Current *Current_ptr; @@ -1210,7 +1522,7 @@ #endif /* end #if !defined */ -@@ -1857,14 +1871,14 @@ +@@ -1857,14 +2181,14 @@ Current_var (Current_ptr); Current_var (const Current_var &); // copy constructor ~Current_var (void); // destructor @@ -1228,7 +1540,7 @@ Current_ptr in (void) const; Current_ptr &inout (void); Current_ptr &out (void); -@@ -1897,7 +1911,7 @@ +@@ -1897,7 +2221,7 @@ operator Current_ptr &(); Current_ptr &ptr (void); Current_ptr operator-> (void); @@ -1237,7 +1549,7 @@ private: Current_ptr &ptr_; }; -@@ -1921,12 +1935,12 @@ +@@ -1921,12 +2245,12 @@ static Current_ptr _duplicate (Current_ptr obj); static Current_ptr _narrow ( CORBA::Object_ptr obj, @@ -1252,7 +1564,7 @@ TAO_default_environment () ); static Current_ptr _nil (void) -@@ -1935,7 +1949,7 @@ +@@ -1935,7 +2259,7 @@ } virtual RTCORBA::Priority the_priority ( @@ -1261,7 +1573,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -1944,7 +1958,7 @@ +@@ -1944,7 +2268,7 @@ virtual void the_priority ( RTCORBA::Priority the_priority, @@ -1270,7 +1582,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -1952,7 +1966,7 @@ +@@ -1952,7 +2276,7 @@ )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1279,7 +1591,7 @@ virtual const char* _interface_repository_id (void) const; protected: -@@ -1972,7 +1986,7 @@ +@@ -1972,7 +2296,7 @@ class Mutex; typedef Mutex *Mutex_ptr; @@ -1288,7 +1600,7 @@ #endif /* end #if !defined */ -@@ -1986,14 +2000,14 @@ +@@ -1986,14 +2310,14 @@ Mutex_var (Mutex_ptr); Mutex_var (const Mutex_var &); // copy constructor ~Mutex_var (void); // destructor @@ -1306,7 +1618,7 @@ Mutex_ptr in (void) const; Mutex_ptr &inout (void); Mutex_ptr &out (void); -@@ -2026,7 +2040,7 @@ +@@ -2026,7 +2350,7 @@ operator Mutex_ptr &(); Mutex_ptr &ptr (void); Mutex_ptr operator-> (void); @@ -1315,7 +1627,7 @@ private: Mutex_ptr &ptr_; }; -@@ -2050,12 +2064,12 @@ +@@ -2050,12 +2374,12 @@ static Mutex_ptr _duplicate (Mutex_ptr obj); static Mutex_ptr _narrow ( CORBA::Object_ptr obj, @@ -1330,7 +1642,7 @@ TAO_default_environment () ); static Mutex_ptr _nil (void) -@@ -2064,7 +2078,7 @@ +@@ -2064,7 +2388,7 @@ } virtual void lock ( @@ -1339,7 +1651,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -2072,7 +2086,7 @@ +@@ -2072,7 +2396,7 @@ )) = 0; virtual void unlock ( @@ -1348,7 +1660,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -2081,7 +2095,7 @@ +@@ -2081,7 +2405,7 @@ virtual CORBA::Boolean try_lock ( TimeBase::TimeT max_wait, @@ -1357,7 +1669,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -2089,7 +2103,7 @@ +@@ -2089,7 +2413,7 @@ )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1366,7 +1678,7 @@ virtual const char* _interface_repository_id (void) const; protected: -@@ -2103,13 +2117,12 @@ +@@ -2103,13 +2427,12 @@ #endif /* end #if !defined */ @@ -1381,7 +1693,7 @@ #endif /* end #if !defined */ -@@ -2123,14 +2136,14 @@ +@@ -2123,14 +2446,14 @@ RTORB_var (RTORB_ptr); RTORB_var (const RTORB_var &); // copy constructor ~RTORB_var (void); // destructor @@ -1399,7 +1711,7 @@ RTORB_ptr in (void) const; RTORB_ptr &inout (void); RTORB_ptr &out (void); -@@ -2163,7 +2176,7 @@ +@@ -2163,7 +2486,7 @@ operator RTORB_ptr &(); RTORB_ptr &ptr (void); RTORB_ptr operator-> (void); @@ -1408,7 +1720,7 @@ private: RTORB_ptr &ptr_; }; -@@ -2187,12 +2200,12 @@ +@@ -2187,12 +2510,12 @@ static RTORB_ptr _duplicate (RTORB_ptr obj); static RTORB_ptr _narrow ( CORBA::Object_ptr obj, @@ -1423,7 +1735,7 @@ TAO_default_environment () ); static RTORB_ptr _nil (void) -@@ -2201,7 +2214,7 @@ +@@ -2201,7 +2524,7 @@ } virtual RTCORBA::Mutex_ptr create_mutex ( @@ -1432,7 +1744,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -2210,7 +2223,7 @@ +@@ -2210,7 +2533,7 @@ virtual void destroy_mutex ( RTCORBA::Mutex_ptr the_mutex, @@ -1441,7 +1753,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -2241,7 +2254,7 @@ +@@ -2241,7 +2564,7 @@ TAO_InputCDR &, CORBA::Environment &); @@ -1450,7 +1762,7 @@ // = TAO extension -@@ -2249,7 +2262,7 @@ +@@ -2249,7 +2572,7 @@ }; // exception RTCORBA::RTORB::InvalidThreadpool @@ -1459,7 +1771,7 @@ #endif /* end #if !defined */ virtual RTCORBA::ThreadpoolId create_threadpool ( -@@ -2260,7 +2273,7 @@ +@@ -2260,7 +2583,7 @@ CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size, @@ -1468,7 +1780,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -2274,7 +2287,7 @@ +@@ -2274,7 +2597,7 @@ CORBA::Boolean allow_request_buffering, CORBA::ULong max_buffered_requests, CORBA::ULong max_request_buffer_size, @@ -1477,7 +1789,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -2283,7 +2296,7 @@ +@@ -2283,7 +2606,7 @@ virtual void destroy_threadpool ( RTCORBA::ThreadpoolId threadpool, @@ -1486,7 +1798,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -2294,7 +2307,7 @@ +@@ -2294,7 +2617,7 @@ virtual RTCORBA::PriorityModelPolicy_ptr create_priority_model_policy ( RTCORBA::PriorityModel priority_model, RTCORBA::Priority server_priority, @@ -1495,7 +1807,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -2303,7 +2316,7 @@ +@@ -2303,7 +2626,7 @@ virtual RTCORBA::ThreadpoolPolicy_ptr create_threadpool_policy ( RTCORBA::ThreadpoolId threadpool, @@ -1504,7 +1816,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -2312,7 +2325,7 @@ +@@ -2312,7 +2635,7 @@ virtual RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy ( const RTCORBA::PriorityBands & priority_bands, @@ -1513,7 +1825,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -2320,7 +2333,7 @@ +@@ -2320,7 +2643,7 @@ )) = 0; virtual RTCORBA::PrivateConnectionPolicy_ptr create_private_connection_policy ( @@ -1522,7 +1834,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -2329,7 +2342,7 @@ +@@ -2329,7 +2652,7 @@ virtual RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy ( const RTCORBA::ProtocolList & protocols, @@ -1531,7 +1843,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -2338,7 +2351,7 @@ +@@ -2338,7 +2661,7 @@ virtual RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy ( const RTCORBA::ProtocolList & protocols, @@ -1540,7 +1852,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -2346,7 +2359,7 @@ +@@ -2346,7 +2669,7 @@ )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -1549,7 +1861,7 @@ virtual const char* _interface_repository_id (void) const; protected: -@@ -2360,7 +2373,6 @@ +@@ -2360,7 +2683,6 @@ #endif /* end #if !defined */ @@ -1557,7 +1869,7 @@ } TAO_NAMESPACE_CLOSE // module RTCORBA -@@ -2402,7 +2414,7 @@ +@@ -2402,7 +2724,7 @@ #endif /* _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_H_ */ @@ -1566,7 +1878,7 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::PriorityModel &); TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::PriorityBand &); TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::PriorityBand &); -@@ -2432,6 +2444,8 @@ +@@ -2432,6 +2754,8 @@ #if defined(_MSC_VER) && (_MSC_VER >= 1200) #pragma warning(pop) #endif /* _MSC_VER */ diff --git a/TAO/tao/diffs/RTCORBAC.i.diff b/TAO/tao/diffs/RTCORBAC.i.diff index 4119def2a4f..079e8ce1535 100644 --- a/TAO/tao/diffs/RTCORBAC.i.diff +++ b/TAO/tao/diffs/RTCORBAC.i.diff @@ -1,5 +1,11 @@ --- orig/RTCORBAC.i Sat May 20 22:29:17 2000 -+++ RTCORBAC.i Sat May 20 15:27:13 2000 ++++ RTCORBAC.i Fri Aug 18 20:23:55 2000 +@@ -1,4 +1,4 @@ +-/* -*- C++ -*- $Id$ */ ++/* -*- C++ -*- $Id$ */ + + // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* + // TAO and the TAO IDL Compiler have been developed by the Center for @@ -93,13 +93,13 @@ } @@ -147,7 +153,15 @@ ACE_INLINE RTCORBA::ThreadpoolLane * RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::get_buffer (CORBA::Boolean orphan) { -@@ -282,13 +282,13 @@ +@@ -261,6 +261,7 @@ + { + result = _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (this->length_); + this->buffer_ = result; ++ this->release_ = 1; + } + else + { +@@ -282,13 +283,13 @@ } return result; } @@ -163,7 +177,7 @@ ACE_INLINE void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::replace (CORBA::ULong max, CORBA::ULong length, -@@ -305,11 +305,11 @@ +@@ -305,11 +306,11 @@ this->buffer_ = data; this->release_ = release; } @@ -177,7 +191,7 @@ #if !defined (_RTCORBA_THREADPOOLLANES_CI_) #define _RTCORBA_THREADPOOLLANES_CI_ -@@ -393,20 +393,20 @@ +@@ -393,20 +394,20 @@ return this->ptr_; } @@ -203,7 +217,7 @@ { return *this->ptr_; } -@@ -429,7 +429,7 @@ +@@ -429,7 +430,7 @@ return *this->ptr_; } @@ -212,7 +226,7 @@ ACE_INLINE ::RTCORBA::ThreadpoolLanes *& RTCORBA::ThreadpoolLanes_var::out (void) { -@@ -490,7 +490,7 @@ +@@ -490,7 +491,7 @@ return *this; } @@ -221,7 +235,7 @@ RTCORBA::ThreadpoolLanes_out::operator ::RTCORBA::ThreadpoolLanes *&() // cast { return this->ptr_; -@@ -517,6 +517,14 @@ +@@ -517,6 +518,14 @@ #endif /* end #if !defined */ @@ -236,7 +250,7 @@ #if !defined (_RTCORBA_PRIORITYMODELPOLICY___VAR_CI_) #define _RTCORBA_PRIORITYMODELPOLICY___VAR_CI_ -@@ -572,14 +580,14 @@ +@@ -572,14 +581,14 @@ return *this; } @@ -254,7 +268,7 @@ { return this->ptr_; } -@@ -671,7 +679,7 @@ +@@ -671,7 +680,7 @@ return *this; } @@ -263,7 +277,7 @@ RTCORBA::PriorityModelPolicy_out::operator ::RTCORBA::PriorityModelPolicy_ptr &() // cast { return this->ptr_; -@@ -692,6 +700,14 @@ +@@ -692,6 +701,14 @@ #endif /* end #if !defined */ @@ -278,7 +292,7 @@ #if !defined (_RTCORBA_THREADPOOLPOLICY___VAR_CI_) #define _RTCORBA_THREADPOOLPOLICY___VAR_CI_ -@@ -747,14 +763,14 @@ +@@ -747,14 +764,14 @@ return *this; } @@ -296,7 +310,7 @@ { return this->ptr_; } -@@ -846,7 +862,7 @@ +@@ -846,7 +863,7 @@ return *this; } @@ -305,7 +319,7 @@ RTCORBA::ThreadpoolPolicy_out::operator ::RTCORBA::ThreadpoolPolicy_ptr &() // cast { return this->ptr_; -@@ -867,6 +883,14 @@ +@@ -867,6 +884,14 @@ #endif /* end #if !defined */ @@ -320,7 +334,7 @@ #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___VAR_CI_) #define _RTCORBA_PRIVATECONNECTIONPOLICY___VAR_CI_ -@@ -922,14 +946,14 @@ +@@ -922,14 +947,14 @@ return *this; } @@ -338,7 +352,7 @@ { return this->ptr_; } -@@ -1021,7 +1045,7 @@ +@@ -1021,7 +1046,7 @@ return *this; } @@ -347,7 +361,7 @@ RTCORBA::PrivateConnectionPolicy_out::operator ::RTCORBA::PrivateConnectionPolicy_ptr &() // cast { return this->ptr_; -@@ -1128,13 +1152,13 @@ +@@ -1128,13 +1153,13 @@ } ACE_INLINE @@ -363,7 +377,7 @@ { return *this->ptr_; } -@@ -1151,7 +1175,7 @@ +@@ -1151,7 +1176,7 @@ return *this->ptr_; } @@ -372,7 +386,7 @@ ACE_INLINE ::RTCORBA::PriorityBand & RTCORBA::PriorityBand_var::out (void) { -@@ -1172,7 +1196,7 @@ +@@ -1172,7 +1197,7 @@ #if !defined (TAO_USE_SEQUENCE_TEMPLATES) @@ -381,7 +395,7 @@ #if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CI_) #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CI_ -@@ -1185,24 +1209,24 @@ +@@ -1185,24 +1210,24 @@ ACE_NEW_RETURN (retval, RTCORBA::PriorityBand[size], 0); return retval; } @@ -410,7 +424,7 @@ ACE_INLINE RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum, CORBA::ULong length, -@@ -1211,7 +1235,7 @@ +@@ -1211,7 +1236,7 @@ : TAO_Unbounded_Base_Sequence (maximum, length, data, release) { } @@ -419,7 +433,7 @@ ACE_INLINE RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs) // Copy constructor. -@@ -1221,10 +1245,10 @@ +@@ -1221,10 +1246,10 @@ { RTCORBA::PriorityBand *tmp1 = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (this->maximum_); RTCORBA::PriorityBand * const tmp2 = ACE_reinterpret_cast (RTCORBA::PriorityBand * ACE_CAST_CONST, rhs.buffer_); @@ -432,7 +446,7 @@ this->buffer_ = tmp1; } else -@@ -1232,14 +1256,14 @@ +@@ -1232,14 +1257,14 @@ this->buffer_ = 0; } } @@ -449,7 +463,7 @@ if (this->release_) { if (this->maximum_ < rhs.maximum_) -@@ -1252,18 +1276,18 @@ +@@ -1252,18 +1277,18 @@ } else this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (rhs.maximum_); @@ -473,7 +487,7 @@ // = Accessors. ACE_INLINE RTCORBA::PriorityBand & RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::operator[] (CORBA::ULong i) -@@ -1273,7 +1297,7 @@ +@@ -1273,7 +1298,7 @@ RTCORBA::PriorityBand* tmp = ACE_reinterpret_cast(RTCORBA::PriorityBand*,this->buffer_); return tmp[i]; } @@ -482,7 +496,7 @@ ACE_INLINE const RTCORBA::PriorityBand & RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::operator[] (CORBA::ULong i) const // operator [] -@@ -1282,9 +1306,9 @@ +@@ -1282,9 +1307,9 @@ RTCORBA::PriorityBand * const tmp = ACE_reinterpret_cast (RTCORBA::PriorityBand* ACE_CAST_CONST, this->buffer_); return tmp[i]; } @@ -494,7 +508,15 @@ ACE_INLINE RTCORBA::PriorityBand * RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::get_buffer (CORBA::Boolean orphan) { -@@ -1317,13 +1341,13 @@ +@@ -1296,6 +1321,7 @@ + { + result = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (this->length_); + this->buffer_ = result; ++ this->release_ = 1; + } + else + { +@@ -1317,13 +1343,13 @@ } return result; } @@ -510,7 +532,7 @@ ACE_INLINE void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::replace (CORBA::ULong max, CORBA::ULong length, -@@ -1340,11 +1364,11 @@ +@@ -1340,11 +1366,11 @@ this->buffer_ = data; this->release_ = release; } @@ -524,7 +546,7 @@ #if !defined (_RTCORBA_PRIORITYBANDS_CI_) #define _RTCORBA_PRIORITYBANDS_CI_ -@@ -1428,20 +1452,20 @@ +@@ -1428,20 +1454,20 @@ return this->ptr_; } @@ -550,7 +572,7 @@ { return *this->ptr_; } -@@ -1464,7 +1488,7 @@ +@@ -1464,7 +1490,7 @@ return *this->ptr_; } @@ -559,7 +581,7 @@ ACE_INLINE ::RTCORBA::PriorityBands *& RTCORBA::PriorityBands_var::out (void) { -@@ -1525,7 +1549,7 @@ +@@ -1525,7 +1551,7 @@ return *this; } @@ -568,7 +590,7 @@ RTCORBA::PriorityBands_out::operator ::RTCORBA::PriorityBands *&() // cast { return this->ptr_; -@@ -1552,6 +1576,14 @@ +@@ -1552,6 +1578,14 @@ #endif /* end #if !defined */ @@ -583,7 +605,7 @@ #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___VAR_CI_) #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___VAR_CI_ -@@ -1607,14 +1639,14 @@ +@@ -1607,14 +1641,14 @@ return *this; } @@ -601,7 +623,7 @@ { return this->ptr_; } -@@ -1706,7 +1738,7 @@ +@@ -1706,7 +1740,7 @@ return *this; } @@ -610,7 +632,7 @@ RTCORBA::PriorityBandedConnectionPolicy_out::operator ::RTCORBA::PriorityBandedConnectionPolicy_ptr &() // cast { return this->ptr_; -@@ -1727,6 +1759,14 @@ +@@ -1727,6 +1761,14 @@ #endif /* end #if !defined */ @@ -625,7 +647,7 @@ #if !defined (_RTCORBA_PROTOCOLPROPERTIES___VAR_CI_) #define _RTCORBA_PROTOCOLPROPERTIES___VAR_CI_ -@@ -1782,14 +1822,14 @@ +@@ -1782,14 +1824,14 @@ return *this; } @@ -643,7 +665,7 @@ { return this->ptr_; } -@@ -1881,7 +1921,7 @@ +@@ -1881,7 +1923,7 @@ return *this; } @@ -652,7 +674,7 @@ RTCORBA::ProtocolProperties_out::operator ::RTCORBA::ProtocolProperties_ptr &() // cast { return this->ptr_; -@@ -1902,6 +1942,14 @@ +@@ -1902,6 +1944,14 @@ #endif /* end #if !defined */ @@ -667,7 +689,7 @@ #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES___VAR_CI_) #define _RTCORBA_TCPPROTOCOLPROPERTIES___VAR_CI_ -@@ -1957,14 +2005,14 @@ +@@ -1957,14 +2007,14 @@ return *this; } @@ -685,7 +707,7 @@ { return this->ptr_; } -@@ -2056,7 +2104,7 @@ +@@ -2056,7 +2106,7 @@ return *this; } @@ -694,7 +716,7 @@ RTCORBA::TCPProtocolProperties_out::operator ::RTCORBA::TCPProtocolProperties_ptr &() // cast { return this->ptr_; -@@ -2077,6 +2125,14 @@ +@@ -2077,6 +2127,14 @@ #endif /* end #if !defined */ @@ -709,7 +731,7 @@ #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES___VAR_CI_) #define _RTCORBA_GIOPPROTOCOLPROPERTIES___VAR_CI_ -@@ -2132,14 +2188,14 @@ +@@ -2132,14 +2190,14 @@ return *this; } @@ -727,7 +749,7 @@ { return this->ptr_; } -@@ -2231,7 +2287,7 @@ +@@ -2231,7 +2289,7 @@ return *this; } @@ -736,7 +758,354 @@ RTCORBA::GIOPProtocolProperties_out::operator ::RTCORBA::GIOPProtocolProperties_ptr &() // cast { return this->ptr_; -@@ -2319,20 +2375,20 @@ +@@ -2252,6 +2310,346 @@ + + #endif /* end #if !defined */ + ++ ++#if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___VAR_CI_) ++#define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___VAR_CI_ ++ ++// ************************************************************* ++// Inline operations for class RTCORBA::UnixDomainProtocolProperties_var ++// ************************************************************* ++ ++ACE_INLINE ++RTCORBA::UnixDomainProtocolProperties_var::UnixDomainProtocolProperties_var (void) // default constructor ++ : ptr_ (UnixDomainProtocolProperties::_nil ()) ++{} ++ ++ACE_INLINE ::RTCORBA::UnixDomainProtocolProperties_ptr ++RTCORBA::UnixDomainProtocolProperties_var::ptr (void) const ++{ ++ return this->ptr_; ++} ++ ++ACE_INLINE ++RTCORBA::UnixDomainProtocolProperties_var::UnixDomainProtocolProperties_var (const ::RTCORBA::UnixDomainProtocolProperties_var &p) // copy constructor ++ : TAO_Base_var (), ++ ptr_ (UnixDomainProtocolProperties::_duplicate (p.ptr ())) ++{} ++ ++ACE_INLINE ++RTCORBA::UnixDomainProtocolProperties_var::~UnixDomainProtocolProperties_var (void) // destructor ++{ ++ CORBA::release (this->ptr_); ++} ++ ++ACE_INLINE RTCORBA::UnixDomainProtocolProperties_var & ++RTCORBA::UnixDomainProtocolProperties_var::operator= (UnixDomainProtocolProperties_ptr p) ++{ ++ CORBA::release (this->ptr_); ++ this->ptr_ = p; ++ return *this; ++} ++ ++ACE_INLINE RTCORBA::UnixDomainProtocolProperties_var & ++RTCORBA::UnixDomainProtocolProperties_var::operator= (const ::RTCORBA::UnixDomainProtocolProperties_var &p) ++{ ++ if (this != &p) ++ { ++ CORBA::release (this->ptr_); ++ this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_duplicate (p.ptr ()); ++ } ++ return *this; ++} ++ ++ACE_INLINE ++RTCORBA::UnixDomainProtocolProperties_var::operator const ::RTCORBA::UnixDomainProtocolProperties_ptr &() const // cast ++{ ++ return this->ptr_; ++} ++ ++ACE_INLINE ++RTCORBA::UnixDomainProtocolProperties_var::operator ::RTCORBA::UnixDomainProtocolProperties_ptr &() // cast ++{ ++ return this->ptr_; ++} ++ ++ACE_INLINE ::RTCORBA::UnixDomainProtocolProperties_ptr ++RTCORBA::UnixDomainProtocolProperties_var::operator-> (void) const ++{ ++ return this->ptr_; ++} ++ ++ACE_INLINE ::RTCORBA::UnixDomainProtocolProperties_ptr ++RTCORBA::UnixDomainProtocolProperties_var::in (void) const ++{ ++ return this->ptr_; ++} ++ ++ACE_INLINE ::RTCORBA::UnixDomainProtocolProperties_ptr & ++RTCORBA::UnixDomainProtocolProperties_var::inout (void) ++{ ++ return this->ptr_; ++} ++ ++ACE_INLINE ::RTCORBA::UnixDomainProtocolProperties_ptr & ++RTCORBA::UnixDomainProtocolProperties_var::out (void) ++{ ++ CORBA::release (this->ptr_); ++ this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_nil (); ++ return this->ptr_; ++} ++ ++ACE_INLINE ::RTCORBA::UnixDomainProtocolProperties_ptr ++RTCORBA::UnixDomainProtocolProperties_var::_retn (void) ++{ ++ // yield ownership of managed obj reference ++ ::RTCORBA::UnixDomainProtocolProperties_ptr val = this->ptr_; ++ this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_nil (); ++ return val; ++} ++ ++ ++#endif /* end #if !defined */ ++ ++ ++#if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___OUT_CI_) ++#define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___OUT_CI_ ++ ++// ************************************************************* ++// Inline operations for class RTCORBA::UnixDomainProtocolProperties_out ++// ************************************************************* ++ ++ACE_INLINE ++RTCORBA::UnixDomainProtocolProperties_out::UnixDomainProtocolProperties_out (UnixDomainProtocolProperties_ptr &p) ++ : ptr_ (p) ++{ ++ this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_nil (); ++} ++ ++ACE_INLINE ++RTCORBA::UnixDomainProtocolProperties_out::UnixDomainProtocolProperties_out (UnixDomainProtocolProperties_var &p) // constructor from _var ++ : ptr_ (p.out ()) ++{ ++ CORBA::release (this->ptr_); ++ this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_nil (); ++} ++ ++ACE_INLINE ++RTCORBA::UnixDomainProtocolProperties_out::UnixDomainProtocolProperties_out (const ::RTCORBA::UnixDomainProtocolProperties_out &p) // copy constructor ++ : ptr_ (ACE_const_cast (UnixDomainProtocolProperties_out &, p).ptr_) ++{} ++ ++ACE_INLINE ::RTCORBA::UnixDomainProtocolProperties_out & ++RTCORBA::UnixDomainProtocolProperties_out::operator= (const ::RTCORBA::UnixDomainProtocolProperties_out &p) ++{ ++ this->ptr_ = ACE_const_cast (UnixDomainProtocolProperties_out&, p).ptr_; ++ return *this; ++} ++ ++ACE_INLINE RTCORBA::UnixDomainProtocolProperties_out & ++RTCORBA::UnixDomainProtocolProperties_out::operator= (const ::RTCORBA::UnixDomainProtocolProperties_var &p) ++{ ++ this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_duplicate (p.ptr ()); ++ return *this; ++} ++ ++ACE_INLINE RTCORBA::UnixDomainProtocolProperties_out & ++RTCORBA::UnixDomainProtocolProperties_out::operator= (UnixDomainProtocolProperties_ptr p) ++{ ++ this->ptr_ = p; ++ return *this; ++} ++ ++ACE_INLINE ++RTCORBA::UnixDomainProtocolProperties_out::operator ::RTCORBA::UnixDomainProtocolProperties_ptr &() // cast ++{ ++ return this->ptr_; ++} ++ ++ACE_INLINE ::RTCORBA::UnixDomainProtocolProperties_ptr & ++RTCORBA::UnixDomainProtocolProperties_out::ptr (void) // ptr ++{ ++ return this->ptr_; ++} ++ ++ACE_INLINE ::RTCORBA::UnixDomainProtocolProperties_ptr ++RTCORBA::UnixDomainProtocolProperties_out::operator-> (void) ++{ ++ return this->ptr_; ++} ++ ++ ++#endif /* end #if !defined */ ++ ++ ++#if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___VAR_CI_) ++#define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___VAR_CI_ ++ ++// ************************************************************* ++// Inline operations for class RTCORBA::SharedMemoryProtocolProperties_var ++// ************************************************************* ++ ++ACE_INLINE ++RTCORBA::SharedMemoryProtocolProperties_var::SharedMemoryProtocolProperties_var (void) // default constructor ++ : ptr_ (SharedMemoryProtocolProperties::_nil ()) ++{} ++ ++ACE_INLINE ::RTCORBA::SharedMemoryProtocolProperties_ptr ++RTCORBA::SharedMemoryProtocolProperties_var::ptr (void) const ++{ ++ return this->ptr_; ++} ++ ++ACE_INLINE ++RTCORBA::SharedMemoryProtocolProperties_var::SharedMemoryProtocolProperties_var (const ::RTCORBA::SharedMemoryProtocolProperties_var &p) // copy constructor ++ : TAO_Base_var (), ++ ptr_ (SharedMemoryProtocolProperties::_duplicate (p.ptr ())) ++{} ++ ++ACE_INLINE ++RTCORBA::SharedMemoryProtocolProperties_var::~SharedMemoryProtocolProperties_var (void) // destructor ++{ ++ CORBA::release (this->ptr_); ++} ++ ++ACE_INLINE RTCORBA::SharedMemoryProtocolProperties_var & ++RTCORBA::SharedMemoryProtocolProperties_var::operator= (SharedMemoryProtocolProperties_ptr p) ++{ ++ CORBA::release (this->ptr_); ++ this->ptr_ = p; ++ return *this; ++} ++ ++ACE_INLINE RTCORBA::SharedMemoryProtocolProperties_var & ++RTCORBA::SharedMemoryProtocolProperties_var::operator= (const ::RTCORBA::SharedMemoryProtocolProperties_var &p) ++{ ++ if (this != &p) ++ { ++ CORBA::release (this->ptr_); ++ this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_duplicate (p.ptr ()); ++ } ++ return *this; ++} ++ ++ACE_INLINE ++RTCORBA::SharedMemoryProtocolProperties_var::operator const ::RTCORBA::SharedMemoryProtocolProperties_ptr &() const // cast ++{ ++ return this->ptr_; ++} ++ ++ACE_INLINE ++RTCORBA::SharedMemoryProtocolProperties_var::operator ::RTCORBA::SharedMemoryProtocolProperties_ptr &() // cast ++{ ++ return this->ptr_; ++} ++ ++ACE_INLINE ::RTCORBA::SharedMemoryProtocolProperties_ptr ++RTCORBA::SharedMemoryProtocolProperties_var::operator-> (void) const ++{ ++ return this->ptr_; ++} ++ ++ACE_INLINE ::RTCORBA::SharedMemoryProtocolProperties_ptr ++RTCORBA::SharedMemoryProtocolProperties_var::in (void) const ++{ ++ return this->ptr_; ++} ++ ++ACE_INLINE ::RTCORBA::SharedMemoryProtocolProperties_ptr & ++RTCORBA::SharedMemoryProtocolProperties_var::inout (void) ++{ ++ return this->ptr_; ++} ++ ++ACE_INLINE ::RTCORBA::SharedMemoryProtocolProperties_ptr & ++RTCORBA::SharedMemoryProtocolProperties_var::out (void) ++{ ++ CORBA::release (this->ptr_); ++ this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_nil (); ++ return this->ptr_; ++} ++ ++ACE_INLINE ::RTCORBA::SharedMemoryProtocolProperties_ptr ++RTCORBA::SharedMemoryProtocolProperties_var::_retn (void) ++{ ++ // yield ownership of managed obj reference ++ ::RTCORBA::SharedMemoryProtocolProperties_ptr val = this->ptr_; ++ this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_nil (); ++ return val; ++} ++ ++ ++#endif /* end #if !defined */ ++ ++ ++#if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___OUT_CI_) ++#define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___OUT_CI_ ++ ++// ************************************************************* ++// Inline operations for class RTCORBA::SharedMemoryProtocolProperties_out ++// ************************************************************* ++ ++ACE_INLINE ++RTCORBA::SharedMemoryProtocolProperties_out::SharedMemoryProtocolProperties_out (SharedMemoryProtocolProperties_ptr &p) ++ : ptr_ (p) ++{ ++ this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_nil (); ++} ++ ++ACE_INLINE ++RTCORBA::SharedMemoryProtocolProperties_out::SharedMemoryProtocolProperties_out (SharedMemoryProtocolProperties_var &p) // constructor from _var ++ : ptr_ (p.out ()) ++{ ++ CORBA::release (this->ptr_); ++ this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_nil (); ++} ++ ++ACE_INLINE ++RTCORBA::SharedMemoryProtocolProperties_out::SharedMemoryProtocolProperties_out (const ::RTCORBA::SharedMemoryProtocolProperties_out &p) // copy constructor ++ : ptr_ (ACE_const_cast (SharedMemoryProtocolProperties_out &, p).ptr_) ++{} ++ ++ACE_INLINE ::RTCORBA::SharedMemoryProtocolProperties_out & ++RTCORBA::SharedMemoryProtocolProperties_out::operator= (const ::RTCORBA::SharedMemoryProtocolProperties_out &p) ++{ ++ this->ptr_ = ACE_const_cast (SharedMemoryProtocolProperties_out&, p).ptr_; ++ return *this; ++} ++ ++ACE_INLINE RTCORBA::SharedMemoryProtocolProperties_out & ++RTCORBA::SharedMemoryProtocolProperties_out::operator= (const ::RTCORBA::SharedMemoryProtocolProperties_var &p) ++{ ++ this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_duplicate (p.ptr ()); ++ return *this; ++} ++ ++ACE_INLINE RTCORBA::SharedMemoryProtocolProperties_out & ++RTCORBA::SharedMemoryProtocolProperties_out::operator= (SharedMemoryProtocolProperties_ptr p) ++{ ++ this->ptr_ = p; ++ return *this; ++} ++ ++ACE_INLINE ++RTCORBA::SharedMemoryProtocolProperties_out::operator ::RTCORBA::SharedMemoryProtocolProperties_ptr &() // cast ++{ ++ return this->ptr_; ++} ++ ++ACE_INLINE ::RTCORBA::SharedMemoryProtocolProperties_ptr & ++RTCORBA::SharedMemoryProtocolProperties_out::ptr (void) // ptr ++{ ++ return this->ptr_; ++} ++ ++ACE_INLINE ::RTCORBA::SharedMemoryProtocolProperties_ptr ++RTCORBA::SharedMemoryProtocolProperties_out::operator-> (void) ++{ ++ return this->ptr_; ++} ++ ++ ++#endif /* end #if !defined */ ++ + // ************************************************************* + // Inline operations for class RTCORBA::Protocol_var + // ************************************************************* +@@ -2319,20 +2717,20 @@ } ACE_INLINE @@ -760,7 +1129,7 @@ { return this->ptr_; } -@@ -2349,7 +2405,7 @@ +@@ -2349,7 +2747,7 @@ return *this->ptr_; } @@ -769,7 +1138,7 @@ ACE_INLINE ::RTCORBA::Protocol *& RTCORBA::Protocol_var::out (void) { -@@ -2410,7 +2466,7 @@ +@@ -2410,7 +2808,7 @@ return *this; } @@ -778,7 +1147,7 @@ RTCORBA::Protocol_out::operator ::RTCORBA::Protocol *&() // cast { return this->ptr_; -@@ -2430,7 +2486,7 @@ +@@ -2430,7 +2828,7 @@ #if !defined (TAO_USE_SEQUENCE_TEMPLATES) @@ -787,7 +1156,7 @@ #if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CI_) #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CI_ -@@ -2443,24 +2499,24 @@ +@@ -2443,24 +2841,24 @@ ACE_NEW_RETURN (retval, RTCORBA::Protocol[size], 0); return retval; } @@ -816,7 +1185,7 @@ ACE_INLINE RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum, CORBA::ULong length, -@@ -2469,7 +2525,7 @@ +@@ -2469,7 +2867,7 @@ : TAO_Unbounded_Base_Sequence (maximum, length, data, release) { } @@ -825,7 +1194,7 @@ ACE_INLINE RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs) // Copy constructor. -@@ -2479,10 +2535,10 @@ +@@ -2479,10 +2877,10 @@ { RTCORBA::Protocol *tmp1 = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (this->maximum_); RTCORBA::Protocol * const tmp2 = ACE_reinterpret_cast (RTCORBA::Protocol * ACE_CAST_CONST, rhs.buffer_); @@ -838,7 +1207,7 @@ this->buffer_ = tmp1; } else -@@ -2490,14 +2546,14 @@ +@@ -2490,14 +2888,14 @@ this->buffer_ = 0; } } @@ -855,7 +1224,7 @@ if (this->release_) { if (this->maximum_ < rhs.maximum_) -@@ -2510,18 +2566,18 @@ +@@ -2510,18 +2908,18 @@ } else this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (rhs.maximum_); @@ -879,7 +1248,7 @@ // = Accessors. ACE_INLINE RTCORBA::Protocol & RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::operator[] (CORBA::ULong i) -@@ -2531,7 +2587,7 @@ +@@ -2531,7 +2929,7 @@ RTCORBA::Protocol* tmp = ACE_reinterpret_cast(RTCORBA::Protocol*,this->buffer_); return tmp[i]; } @@ -888,7 +1257,7 @@ ACE_INLINE const RTCORBA::Protocol & RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::operator[] (CORBA::ULong i) const // operator [] -@@ -2540,9 +2596,9 @@ +@@ -2540,9 +2938,9 @@ RTCORBA::Protocol * const tmp = ACE_reinterpret_cast (RTCORBA::Protocol* ACE_CAST_CONST, this->buffer_); return tmp[i]; } @@ -900,7 +1269,15 @@ ACE_INLINE RTCORBA::Protocol * RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::get_buffer (CORBA::Boolean orphan) { -@@ -2575,13 +2631,13 @@ +@@ -2554,6 +2952,7 @@ + { + result = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (this->length_); + this->buffer_ = result; ++ this->release_ = 1; + } + else + { +@@ -2575,13 +2974,13 @@ } return result; } @@ -916,7 +1293,7 @@ ACE_INLINE void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::replace (CORBA::ULong max, CORBA::ULong length, -@@ -2598,11 +2654,11 @@ +@@ -2598,11 +2997,11 @@ this->buffer_ = data; this->release_ = release; } @@ -930,7 +1307,7 @@ #if !defined (_RTCORBA_PROTOCOLLIST_CI_) #define _RTCORBA_PROTOCOLLIST_CI_ -@@ -2667,27 +2723,27 @@ +@@ -2667,27 +3066,27 @@ return this->ptr_; } @@ -964,7 +1341,7 @@ { return this->ptr_; } -@@ -2710,7 +2766,7 @@ +@@ -2710,7 +3109,7 @@ return *this->ptr_; } @@ -973,7 +1350,7 @@ ACE_INLINE ::RTCORBA::ProtocolList *& RTCORBA::ProtocolList_var::out (void) { -@@ -2771,7 +2827,7 @@ +@@ -2771,7 +3170,7 @@ return *this; } @@ -982,7 +1359,7 @@ RTCORBA::ProtocolList_out::operator ::RTCORBA::ProtocolList *&() // cast { return this->ptr_; -@@ -2798,6 +2854,14 @@ +@@ -2798,6 +3197,14 @@ #endif /* end #if !defined */ @@ -997,7 +1374,7 @@ #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___VAR_CI_) #define _RTCORBA_SERVERPROTOCOLPOLICY___VAR_CI_ -@@ -2853,14 +2917,14 @@ +@@ -2853,14 +3260,14 @@ return *this; } @@ -1015,7 +1392,7 @@ { return this->ptr_; } -@@ -2952,7 +3016,7 @@ +@@ -2952,7 +3359,7 @@ return *this; } @@ -1024,7 +1401,7 @@ RTCORBA::ServerProtocolPolicy_out::operator ::RTCORBA::ServerProtocolPolicy_ptr &() // cast { return this->ptr_; -@@ -2973,6 +3037,14 @@ +@@ -2973,6 +3380,14 @@ #endif /* end #if !defined */ @@ -1039,7 +1416,7 @@ #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___VAR_CI_) #define _RTCORBA_CLIENTPROTOCOLPOLICY___VAR_CI_ -@@ -3028,14 +3100,14 @@ +@@ -3028,14 +3443,14 @@ return *this; } @@ -1057,7 +1434,7 @@ { return this->ptr_; } -@@ -3127,7 +3199,7 @@ +@@ -3127,7 +3542,7 @@ return *this; } @@ -1066,7 +1443,7 @@ RTCORBA::ClientProtocolPolicy_out::operator ::RTCORBA::ClientProtocolPolicy_ptr &() // cast { return this->ptr_; -@@ -3148,6 +3220,14 @@ +@@ -3148,6 +3563,14 @@ #endif /* end #if !defined */ @@ -1081,7 +1458,7 @@ #if !defined (_RTCORBA_CURRENT___VAR_CI_) #define _RTCORBA_CURRENT___VAR_CI_ -@@ -3203,14 +3283,14 @@ +@@ -3203,14 +3626,14 @@ return *this; } @@ -1099,7 +1476,7 @@ { return this->ptr_; } -@@ -3302,7 +3382,7 @@ +@@ -3302,7 +3725,7 @@ return *this; } @@ -1108,7 +1485,7 @@ RTCORBA::Current_out::operator ::RTCORBA::Current_ptr &() // cast { return this->ptr_; -@@ -3323,6 +3403,14 @@ +@@ -3323,6 +3746,14 @@ #endif /* end #if !defined */ @@ -1123,7 +1500,7 @@ #if !defined (_RTCORBA_MUTEX___VAR_CI_) #define _RTCORBA_MUTEX___VAR_CI_ -@@ -3378,14 +3466,14 @@ +@@ -3378,14 +3809,14 @@ return *this; } @@ -1141,7 +1518,7 @@ { return this->ptr_; } -@@ -3477,7 +3565,7 @@ +@@ -3477,7 +3908,7 @@ return *this; } @@ -1150,7 +1527,7 @@ RTCORBA::Mutex_out::operator ::RTCORBA::Mutex_ptr &() // cast { return this->ptr_; -@@ -3498,9 +3586,13 @@ +@@ -3498,9 +3929,13 @@ #endif /* end #if !defined */ @@ -1167,7 +1544,7 @@ #if !defined (_RTCORBA_RTORB___VAR_CI_) -@@ -3557,14 +3649,14 @@ +@@ -3557,14 +3992,14 @@ return *this; } @@ -1185,7 +1562,7 @@ { return this->ptr_; } -@@ -3656,7 +3748,7 @@ +@@ -3656,7 +4091,7 @@ return *this; } @@ -1194,7 +1571,7 @@ RTCORBA::RTORB_out::operator ::RTCORBA::RTORB_ptr &() // cast { return this->ptr_; -@@ -3677,6 +3769,10 @@ +@@ -3677,6 +4112,10 @@ #endif /* end #if !defined */ @@ -1205,7 +1582,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const RTCORBA::ThreadpoolLane &_tao_aggregate) { if ( -@@ -3687,7 +3783,7 @@ +@@ -3687,7 +4126,7 @@ return 1; else return 0; @@ -1214,7 +1591,7 @@ } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::ThreadpoolLane &_tao_aggregate) -@@ -3700,7 +3796,7 @@ +@@ -3700,7 +4139,7 @@ return 1; else return 0; @@ -1223,7 +1600,7 @@ } -@@ -3744,7 +3840,7 @@ +@@ -3744,7 +4183,7 @@ return 1; else return 0; @@ -1232,7 +1609,7 @@ } ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::PriorityBand &_tao_aggregate) -@@ -3756,7 +3852,7 @@ +@@ -3756,7 +4195,7 @@ return 1; else return 0; @@ -1241,7 +1618,7 @@ } -@@ -3773,4 +3869,3 @@ +@@ -3773,4 +4212,3 @@ ); #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_I_ */ diff --git a/TAO/tao/diffs/TAOC.h.diff b/TAO/tao/diffs/TAOC.h.diff index d68d18dd270..3ce7d73e5c5 100644 --- a/TAO/tao/diffs/TAOC.h.diff +++ b/TAO/tao/diffs/TAOC.h.diff @@ -1,16 +1,19 @@ ---- orig/TAOC.h Mon May 1 09:12:20 2000 -+++ TAOC.h Mon May 1 09:14:12 2000 -@@ -9,21 +9,22 @@ +--- orig/TAOC.h Fri Aug 18 23:18:42 2000 ++++ TAOC.h Tue Jun 27 22:47:12 2000 +@@ -1,4 +1,4 @@ +-/* -*- C++ -*- $Id$ */ ++/* -*- C++ -*- $Id$ */ + + // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* + // TAO and the TAO IDL Compiler have been developed by the Center for +@@ -9,17 +9,24 @@ #ifndef _TAO_IDL_ORIG_TAOC_H_ #define _TAO_IDL_ORIG_TAOC_H_ - #include "ace/pre.h" -#include "tao/corba.h" - --#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) --#include "ace/streams.h" --#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */ ++ +#include "tao/corbafwd.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -28,20 +31,32 @@ + +#endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 || + TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */ ++ ++#include "tao/Priority_Mapping_Manager.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO -@@ -46,6 +47,9 @@ +@@ -42,6 +49,19 @@ TAO_NAMESPACE TAO { + ++#if (TAO_HAS_RT_CORBA == 1) ++ ++ typedef TAO_Priority_Mapping_Manager PriorityMappingManager; ++ typedef TAO_Priority_Mapping_Manager *PriorityMappingManager_ptr; ++ typedef TAO_Priority_Mapping_Manager_var PriorityMappingManager_var; ++ typedef TAO_Priority_Mapping_Manager_out PriorityMappingManager_out; ++ ++#endif /* TAO_HAS_RT_CORBA == 1 */ ++ ++ +#if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1) + typedef CORBA::Short PrioritySelectionMode; typedef CORBA::Short_out PrioritySelectionMode_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrioritySelectionMode; -@@ -58,7 +62,7 @@ +@@ -54,7 +74,7 @@ struct PrioritySpecification; class PrioritySpecification_var; @@ -50,7 +65,7 @@ struct TAO_Export PrioritySpecification { -@@ -81,18 +85,18 @@ +@@ -77,18 +97,18 @@ PrioritySpecification_var (const PrioritySpecification_var &); // copy constructor PrioritySpecification_var (const PrioritySpecification &); // fixed-size types only ~PrioritySpecification_var (void); // destructor @@ -73,7 +88,7 @@ const PrioritySpecification &in (void) const; PrioritySpecification &inout (void); PrioritySpecification &out (void); -@@ -115,7 +119,7 @@ +@@ -111,7 +131,7 @@ class ClientPriorityPolicy; typedef ClientPriorityPolicy *ClientPriorityPolicy_ptr; @@ -82,8 +97,12 @@ #endif /* end #if !defined */ -@@ -129,14 +133,14 @@ - ClientPriorityPolicy_var (ClientPriorityPolicy_ptr); +@@ -122,17 +142,17 @@ + { + public: + ClientPriorityPolicy_var (void); // default constructor +- ClientPriorityPolicy_var (ClientPriorityPolicy_ptr p) : ptr_ (p) {} ++ ClientPriorityPolicy_var (ClientPriorityPolicy_ptr); ClientPriorityPolicy_var (const ClientPriorityPolicy_var &); // copy constructor ~ClientPriorityPolicy_var (void); // destructor - @@ -100,7 +119,7 @@ ClientPriorityPolicy_ptr in (void) const; ClientPriorityPolicy_ptr &inout (void); ClientPriorityPolicy_ptr &out (void); -@@ -166,7 +170,7 @@ +@@ -165,7 +185,7 @@ operator ClientPriorityPolicy_ptr &(); ClientPriorityPolicy_ptr &ptr (void); ClientPriorityPolicy_ptr operator-> (void); @@ -109,7 +128,7 @@ private: ClientPriorityPolicy_ptr &ptr_; }; -@@ -190,12 +194,12 @@ +@@ -189,12 +209,12 @@ static ClientPriorityPolicy_ptr _duplicate (ClientPriorityPolicy_ptr obj); static ClientPriorityPolicy_ptr _narrow ( CORBA::Object_ptr obj, @@ -124,7 +143,7 @@ TAO_default_environment () ); static ClientPriorityPolicy_ptr _nil (void) -@@ -204,7 +208,7 @@ +@@ -203,7 +223,7 @@ } virtual TAO::PrioritySpecification priority_specification ( @@ -133,7 +152,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -212,7 +216,7 @@ +@@ -211,7 +231,7 @@ )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -142,7 +161,7 @@ virtual const char* _interface_repository_id (void) const; protected: -@@ -226,6 +230,10 @@ +@@ -225,6 +245,10 @@ #endif /* end #if !defined */ @@ -153,7 +172,7 @@ typedef CORBA::UShort BufferingConstraintMode; typedef CORBA::UShort_out BufferingConstraintMode_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BufferingConstraintMode; -@@ -240,7 +248,7 @@ +@@ -239,7 +263,7 @@ struct BufferingConstraint; class BufferingConstraint_var; @@ -162,7 +181,7 @@ struct TAO_Export BufferingConstraint { -@@ -264,18 +272,18 @@ +@@ -263,18 +287,18 @@ BufferingConstraint_var (const BufferingConstraint_var &); // copy constructor BufferingConstraint_var (const BufferingConstraint &); // fixed-size types only ~BufferingConstraint_var (void); // destructor @@ -185,7 +204,7 @@ const BufferingConstraint &in (void) const; BufferingConstraint &inout (void); BufferingConstraint &out (void); -@@ -298,7 +306,7 @@ +@@ -297,7 +321,7 @@ class BufferingConstraintPolicy; typedef BufferingConstraintPolicy *BufferingConstraintPolicy_ptr; @@ -194,8 +213,12 @@ #endif /* end #if !defined */ -@@ -312,14 +320,14 @@ - BufferingConstraintPolicy_var (BufferingConstraintPolicy_ptr); +@@ -308,17 +332,17 @@ + { + public: + BufferingConstraintPolicy_var (void); // default constructor +- BufferingConstraintPolicy_var (BufferingConstraintPolicy_ptr p) : ptr_ (p) {} ++ BufferingConstraintPolicy_var (BufferingConstraintPolicy_ptr); BufferingConstraintPolicy_var (const BufferingConstraintPolicy_var &); // copy constructor ~BufferingConstraintPolicy_var (void); // destructor - @@ -212,7 +235,7 @@ BufferingConstraintPolicy_ptr in (void) const; BufferingConstraintPolicy_ptr &inout (void); BufferingConstraintPolicy_ptr &out (void); -@@ -349,7 +357,7 @@ +@@ -351,7 +375,7 @@ operator BufferingConstraintPolicy_ptr &(); BufferingConstraintPolicy_ptr &ptr (void); BufferingConstraintPolicy_ptr operator-> (void); @@ -221,7 +244,7 @@ private: BufferingConstraintPolicy_ptr &ptr_; }; -@@ -373,12 +381,12 @@ +@@ -375,12 +399,12 @@ static BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj); static BufferingConstraintPolicy_ptr _narrow ( CORBA::Object_ptr obj, @@ -236,7 +259,7 @@ TAO_default_environment () ); static BufferingConstraintPolicy_ptr _nil (void) -@@ -387,7 +395,7 @@ +@@ -389,7 +413,7 @@ } virtual TAO::BufferingConstraint buffering_constraint ( @@ -245,7 +268,7 @@ TAO_default_environment () ) ACE_THROW_SPEC (( -@@ -395,7 +403,7 @@ +@@ -397,7 +421,7 @@ )) = 0; virtual void *_tao_QueryInterface (ptr_arith_t type); @@ -254,7 +277,7 @@ virtual const char* _interface_repository_id (void) const; protected: -@@ -409,6 +417,8 @@ +@@ -411,6 +435,8 @@ #endif /* end #if !defined */ @@ -263,7 +286,7 @@ typedef CORBA::Short SyncScope; typedef CORBA::Short_out SyncScope_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SyncScope; -@@ -425,25 +435,41 @@ +@@ -427,25 +453,41 @@ TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_DELAYED_BUFFERING; -- cgit v1.2.1